diff options
author | John Ericson <Ericson2314@yahoo.com> | 2018-08-02 16:36:01 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-02 16:36:01 -0400 |
commit | df5d1673ea6dbdda19ce0f66cbb4026e8794437a (patch) | |
tree | c12e4d19de558d42ecbc939a7f1ff9118662f2b4 /pkgs/tools | |
parent | 89c21fce3fae63cb1460f7da7e9edfe5f6f503c9 (diff) | |
parent | 34da7e2ce2ca92bdeb73d8257e2ca145a0fc45a5 (diff) | |
download | nixlib-df5d1673ea6dbdda19ce0f66cbb4026e8794437a.tar nixlib-df5d1673ea6dbdda19ce0f66cbb4026e8794437a.tar.gz nixlib-df5d1673ea6dbdda19ce0f66cbb4026e8794437a.tar.bz2 nixlib-df5d1673ea6dbdda19ce0f66cbb4026e8794437a.tar.lz nixlib-df5d1673ea6dbdda19ce0f66cbb4026e8794437a.tar.xz nixlib-df5d1673ea6dbdda19ce0f66cbb4026e8794437a.tar.zst nixlib-df5d1673ea6dbdda19ce0f66cbb4026e8794437a.zip |
Merge pull request #44367 from obsidiansystems/no-stdenv-is-cross
treewide: Remove stdenv.isCross
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/compression/lzip/default.nix | 7 | ||||
-rw-r--r-- | pkgs/tools/system/monit/default.nix | 26 |
2 files changed, 22 insertions, 11 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; diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix index 17e472b8d2be..362545285ede 100644 --- a/pkgs/tools/system/monit/default.nix +++ b/pkgs/tools/system/monit/default.nix @@ -1,7 +1,10 @@ -{stdenv, fetchurl, openssl, bison, flex, pam, zlib, usePAM ? stdenv.isLinux - , buildPlatform, hostPlatform }: -let useSSL = (openssl != null); - isCross = ( buildPlatform != hostPlatform ) ; in +{ stdenv +, fetchurl, bison, flex +, zlib +, usePAM ? stdenv.hostPlatform.isLinux, pam +, useSSL ? true, openssl +}: + stdenv.mkDerivation rec { name = "monit-5.25.2"; @@ -15,15 +18,18 @@ stdenv.mkDerivation rec { stdenv.lib.optionals useSSL [ openssl ] ++ stdenv.lib.optionals usePAM [ pam ]; - configureFlags = - if useSSL then [ + configureFlags = [ + (stdenv.lib.withFeature usePAM "pam") + ] ++ (if useSSL then [ "--with-ssl-incl-dir=${openssl.dev}/include" "--with-ssl-lib-dir=${openssl.out}/lib" - ] else [ "--without-ssl" ] ++ - stdenv.lib.optionals (! usePAM) [ "--without-pam" ] ++ + ] else [ + "--without-ssl" + ]) ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # will need to check both these are true for musl - stdenv.lib.optionals isCross [ "libmonit_cv_setjmp_available=yes" - "libmonit_cv_vsnprintf_c99_conformant=yes"]; + "libmonit_cv_setjmp_available=yes" + "libmonit_cv_vsnprintf_c99_conformant=yes" + ]; meta = { homepage = http://mmonit.com/monit/; |