From a5f92046ce8c563fe2f015464ef88255c20b42c7 Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Tue, 24 Nov 2020 00:00:00 -0500 Subject: [PATCH 1/2] par: fix static build This change causes rebuild of both glibc and musl dynamic variants, but no cascade rebuilds. --- pkgs/tools/text/par/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/text/par/default.nix b/pkgs/tools/text/par/default.nix index 54b5e6566e8..d988b2bbbf5 100644 --- a/pkgs/tools/text/par/default.nix +++ b/pkgs/tools/text/par/default.nix @@ -18,7 +18,12 @@ stdenv.mkDerivation { }) ]; - buildPhase = ''make -f protoMakefile''; + makefile = "protoMakefile"; + preBuild = '' + makeFlagsArray=+( CC="${stdenv.cc.targetPrefix}cc -c" \ + LINK1=${stdenv.cc.targetPrefix}cc \ + ) + ''; installPhase = '' mkdir -p $out/bin From 11033cbb6b88c379668efc87eb2e48ed99459eba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 13 Jan 2021 10:00:45 +0100 Subject: [PATCH 2/2] par: fix build --- pkgs/tools/text/par/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/tools/text/par/default.nix b/pkgs/tools/text/par/default.nix index d988b2bbbf5..b9a0bf5e2e5 100644 --- a/pkgs/tools/text/par/default.nix +++ b/pkgs/tools/text/par/default.nix @@ -20,9 +20,7 @@ stdenv.mkDerivation { makefile = "protoMakefile"; preBuild = '' - makeFlagsArray=+( CC="${stdenv.cc.targetPrefix}cc -c" \ - LINK1=${stdenv.cc.targetPrefix}cc \ - ) + makeFlagsArray+=(CC="${stdenv.cc.targetPrefix}cc -c" LINK1=${stdenv.cc.targetPrefix}cc) ''; installPhase = ''