summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2018-02-26 07:42:21 -0500
committerShea Levy <shea@shealevy.com>2018-02-26 07:42:21 -0500
commit044c65bd06e969411f2771e093cf89fd42bbbaf5 (patch)
tree388a232f73fb499e2df08728cd46e602d0fb66db /pkgs/tools
parent4f08b0fbac17c201216abbd776ce3bb292ed4946 (diff)
parent9d2af8d61ca651b5ad505c37f42e10ace4894fc2 (diff)
downloadnixlib-044c65bd06e969411f2771e093cf89fd42bbbaf5.tar
nixlib-044c65bd06e969411f2771e093cf89fd42bbbaf5.tar.gz
nixlib-044c65bd06e969411f2771e093cf89fd42bbbaf5.tar.bz2
nixlib-044c65bd06e969411f2771e093cf89fd42bbbaf5.tar.lz
nixlib-044c65bd06e969411f2771e093cf89fd42bbbaf5.tar.xz
nixlib-044c65bd06e969411f2771e093cf89fd42bbbaf5.tar.zst
nixlib-044c65bd06e969411f2771e093cf89fd42bbbaf5.zip
Merge branch 'systemd-cross' into staging
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/compression/lzip/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix
index 298e490be873..2f6f9aca4323 100644
--- a/pkgs/tools/compression/lzip/default.nix
+++ b/pkgs/tools/compression/lzip/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1abbch762gv8rjr579q3qyyk6c80plklbv2mw4x0vg71dgsw9bgz";
   };
 
-  configureFlags = "CPPFLAGS=-DNDEBUG CFLAGS=-O3 CXXFLAGS=-O3";
+  configureFlags = "CPPFLAGS=-DNDEBUG CFLAGS=-O3 CXXFLAGS=-O3" + stdenv.lib.optionalString stdenv.isCross " CXX=${stdenv.cc.targetPrefix}c++";
 
   setupHook = ./lzip-setup-hook.sh;