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/system/monit | |
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/system/monit')
-rw-r--r-- | pkgs/tools/system/monit/default.nix | 26 |
1 files changed, 16 insertions, 10 deletions
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/; |