forked from mirrors/nixpkgs
treewide: Make explicit that 'dev' output of cyrus_sasl is used
This commit is contained in:
parent
e28e010b36
commit
4e0307dcfc
|
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
configureFlags = [
|
||||
"--with-ldap-dir=${openldap}"
|
||||
"--with-libsasl2-dir=${cyrus_sasl}"
|
||||
"--with-libsasl2-dir=${cyrus_sasl.dev}"
|
||||
"--with-boost-libdir=${boost.out}/lib"
|
||||
"--disable-gconf"
|
||||
];
|
||||
|
|
|
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
|||
"--localstatedir=/var"
|
||||
"--with-openldap"
|
||||
"--with-db=${db}"
|
||||
"--with-sasl=${cyrus_sasl}"
|
||||
"--with-sasl=${cyrus_sasl.dev}"
|
||||
"--with-netsnmp=${net_snmp}"
|
||||
];
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
let
|
||||
ccargs = lib.concatStringsSep " " ([
|
||||
"-DUSE_TLS" "-DUSE_SASL_AUTH" "-DUSE_CYRUS_SASL" "-I${cyrus_sasl}/include/sasl"
|
||||
"-DUSE_TLS" "-DUSE_SASL_AUTH" "-DUSE_CYRUS_SASL" "-I${cyrus_sasl.dev}/include/sasl"
|
||||
"-DHAS_DB_BYPASS_MAKEDEFS_CHECK"
|
||||
"-fPIE" "-fstack-protector-all" "--param" "ssp-buffer-size=4" "-O2" "-D_FORTIFY_SOURCE=2"
|
||||
] ++ lib.optional withPgSQL "-DHAS_PGSQL"
|
||||
|
|
|
@ -18218,7 +18218,7 @@ in modules // {
|
|||
sha256 = "0j5hzaar4d0vhnrlpmkczgwm7ci2wibr99a7zx04xddzrhxdpz82";
|
||||
};
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-I${pkgs.cyrus_sasl}/include/sasl";
|
||||
NIX_CFLAGS_COMPILE = "-I${pkgs.cyrus_sasl.dev}/include/sasl";
|
||||
propagatedBuildInputs = with self; [pkgs.openldap pkgs.cyrus_sasl pkgs.openssl];
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue