From c11d10fc6a18bd991072756e75fba3ae0b65c37a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 6 Jan 2021 07:08:38 +0100 Subject: [PATCH 1/3] libunwind: configureFlags should be a list --- pkgs/development/libraries/libunwind/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index 3816788f929..7e481034f43 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # Without latex2man, no man pages are installed despite being # prebuilt in the source tarball. - configureFlags = "LATEX2MAN=${coreutils}/bin/true"; + configureFlags = [ "LATEX2MAN=${coreutils}/bin/true" ]; propagatedBuildInputs = [ xz ]; From 2af38d76fe6912f0e785b1fe29f35f85a52d7b86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 6 Jan 2021 07:09:17 +0100 Subject: [PATCH 2/3] phpPackags.gettext: configureFlags should be a list --- pkgs/top-level/php-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 95b6d96644d..cb3cfdf7651 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -310,7 +310,7 @@ lib.makeScope pkgs.newScope (self: with self; { }) ]; postPhpize = ''substituteInPlace configure --replace 'as_fn_error $? "Cannot locate header file libintl.h" "$LINENO" 5' ':' ''; - configureFlags = "--with-gettext=${gettext}"; } + configureFlags = [ "--with-gettext=${gettext}" ]; } { name = "gmp"; buildInputs = [ gmp ]; configureFlags = [ "--with-gmp=${gmp.dev}" ]; } From 3364d09e4cefc0b2d680941a4e4271c59d656b9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 6 Jan 2021 09:11:55 +0100 Subject: [PATCH 3/3] strace: mpers check always this fix pkgsStatic on x86 build where we don't support 32bit yet. --- pkgs/development/tools/misc/strace/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 6b797481799..877aedc4e49 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { postPatch = "patchShebangs --host strace-graph"; - configureFlags = stdenv.lib.optional (!stdenv.hostPlatform.isx86) "--enable-mpers=check"; + configureFlags = [ "--enable-mpers=check" ]; meta = with stdenv.lib; { homepage = "https://strace.io/";