about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2020-03-31 02:54:31 +0200
committerJan Tojnar <jtojnar@gmail.com>2020-03-31 02:54:31 +0200
commit40ecaf3808482bb402fc2b06aac5eac55f205bde (patch)
treef085acfd8595c7b5abe26185d0732baccc7eac5c
parent03ccfe23f71704813b1ebc37f97ffd56f7fe5c29 (diff)
downloadnixlib-40ecaf3808482bb402fc2b06aac5eac55f205bde.tar
nixlib-40ecaf3808482bb402fc2b06aac5eac55f205bde.tar.gz
nixlib-40ecaf3808482bb402fc2b06aac5eac55f205bde.tar.bz2
nixlib-40ecaf3808482bb402fc2b06aac5eac55f205bde.tar.lz
nixlib-40ecaf3808482bb402fc2b06aac5eac55f205bde.tar.xz
nixlib-40ecaf3808482bb402fc2b06aac5eac55f205bde.tar.zst
nixlib-40ecaf3808482bb402fc2b06aac5eac55f205bde.zip
Revert "flatpak: do not use autoreconfHook"
This reverts commit a7e4dba1e9b36a4dbb532dd39edaac63cbc98c26.

Apparently, tarballs do not ship autogen.sh 😿
-rw-r--r--pkgs/development/libraries/flatpak/default.nix12
1 files changed, 2 insertions, 10 deletions
diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix
index 62a9ebcd7fb3..ceca7e24fb6e 100644
--- a/pkgs/development/libraries/flatpak/default.nix
+++ b/pkgs/development/libraries/flatpak/default.nix
@@ -1,8 +1,6 @@
 { stdenv
 , fetchurl
-, autoconf
-, automake
-, libtool
+, autoreconfHook
 , docbook_xml_dtd_412
 , docbook_xml_dtd_42
 , docbook_xml_dtd_43
@@ -106,9 +104,7 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
-    autoconf
-    automake
-    libtool
+    autoreconfHook
     libxml2
     docbook_xml_dtd_412
     docbook_xml_dtd_42
@@ -183,10 +179,6 @@ stdenv.mkDerivation rec {
     patchShebangs tests
   '';
 
-  preConfigure = ''
-    NOCONFIGURE=1 ./autogen.sh
-  '';
-
   passthru = {
     tests = {
       installedTests = nixosTests.installed-tests.flatpak;