diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-03-30 23:10:14 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-03-31 02:16:55 +0200 |
| commit | a7e4dba1e9b36a4dbb532dd39edaac63cbc98c26 (patch) | |
| tree | 30a71e9d338ece4f3acf397e86345a4d2a3d8e8f | |
| parent | 648327d510d85dab4627b80e6c1f16db6529b25d (diff) | |
| download | nixlib-a7e4dba1e9b36a4dbb532dd39edaac63cbc98c26.tar nixlib-a7e4dba1e9b36a4dbb532dd39edaac63cbc98c26.tar.gz nixlib-a7e4dba1e9b36a4dbb532dd39edaac63cbc98c26.tar.bz2 nixlib-a7e4dba1e9b36a4dbb532dd39edaac63cbc98c26.tar.lz nixlib-a7e4dba1e9b36a4dbb532dd39edaac63cbc98c26.tar.xz nixlib-a7e4dba1e9b36a4dbb532dd39edaac63cbc98c26.tar.zst nixlib-a7e4dba1e9b36a4dbb532dd39edaac63cbc98c26.zip | |
flatpak: do not use autoreconfHook
They use custom autogen.sh and running autoreconf is not enough. This is necessary when running from Git, which I do on almost every update.
| -rw-r--r-- | pkgs/development/libraries/flatpak/default.nix | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index ceca7e24fb6e..62a9ebcd7fb3 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -1,6 +1,8 @@ { stdenv , fetchurl -, autoreconfHook +, autoconf +, automake +, libtool , docbook_xml_dtd_412 , docbook_xml_dtd_42 , docbook_xml_dtd_43 @@ -104,7 +106,9 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - autoreconfHook + autoconf + automake + libtool libxml2 docbook_xml_dtd_412 docbook_xml_dtd_42 @@ -179,6 +183,10 @@ stdenv.mkDerivation rec { patchShebangs tests ''; + preConfigure = '' + NOCONFIGURE=1 ./autogen.sh + ''; + passthru = { tests = { installedTests = nixosTests.installed-tests.flatpak; |