diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-07-29 16:48:24 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-08-02 15:01:58 -0400 |
| commit | 34da7e2ce2ca92bdeb73d8257e2ca145a0fc45a5 (patch) | |
| tree | c8745f7e51296fe44c6a04927c1c60b040bbab84 /pkgs/tools/compression | |
| parent | 89a89ddfb3665561a3410420634ada773dfea691 (diff) | |
| download | nixlib-34da7e2ce2ca92bdeb73d8257e2ca145a0fc45a5.tar nixlib-34da7e2ce2ca92bdeb73d8257e2ca145a0fc45a5.tar.gz nixlib-34da7e2ce2ca92bdeb73d8257e2ca145a0fc45a5.tar.bz2 nixlib-34da7e2ce2ca92bdeb73d8257e2ca145a0fc45a5.tar.lz nixlib-34da7e2ce2ca92bdeb73d8257e2ca145a0fc45a5.tar.xz nixlib-34da7e2ce2ca92bdeb73d8257e2ca145a0fc45a5.tar.zst nixlib-34da7e2ce2ca92bdeb73d8257e2ca145a0fc45a5.zip | |
treewide: Remove stdenv.isCross
I *want* cross-specific overrides to be verbose, so I rather not have this shorthand. This makes the syntactic overhead more proportional to the maintainence cost. Hopefully this pushes people towards fewer conditionals and more abstractions.
Diffstat (limited to 'pkgs/tools/compression')
| -rw-r--r-- | pkgs/tools/compression/lzip/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix index 25d09e6e947b..561849162167 100644 --- a/pkgs/tools/compression/lzip/default.nix +++ b/pkgs/tools/compression/lzip/default.nix @@ -11,7 +11,12 @@ stdenv.mkDerivation rec { sha256 = "0319q59kb8g324wnj7xzbr7vvlx5bcs13lr34j0zb3kqlyjq2fy9"; }; - configureFlags = "CPPFLAGS=-DNDEBUG CFLAGS=-O3 CXXFLAGS=-O3" + stdenv.lib.optionalString stdenv.isCross " CXX=${stdenv.cc.targetPrefix}c++"; + configureFlags = [ + "CPPFLAGS=-DNDEBUG" + "CFLAGS=-O3" + "CXXFLAGS=-O3" + ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) + "CXX=${stdenv.cc.targetPrefix}c++"; setupHook = ./lzip-setup-hook.sh; |