From 40ecaf3808482bb402fc2b06aac5eac55f205bde Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 31 Mar 2020 02:54:31 +0200 Subject: [PATCH] Revert "flatpak: do not use autoreconfHook" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit a7e4dba1e9b36a4dbb532dd39edaac63cbc98c26. Apparently, tarballs do not ship autogen.sh 😿 --- pkgs/development/libraries/flatpak/default.nix | 12 ++---------- 1 file 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;