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.
This commit is contained in:
@@ -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/;
|
||||
|
||||
Reference in New Issue
Block a user