diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-04-16 19:48:19 +0300 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-19 10:00:30 +0200 |
| commit | 4e0307dcfc4674f733bbb3e93dbe15ae910258e2 (patch) | |
| tree | 94a495ab2217c5ec319e39e4c3db0a28774a97f6 /pkgs | |
| parent | e28e010b36e565a4ac9ea90cc96290023ddd7696 (diff) | |
| download | nixpkgs-4e0307dcfc4674f733bbb3e93dbe15ae910258e2.tar nixpkgs-4e0307dcfc4674f733bbb3e93dbe15ae910258e2.tar.gz nixpkgs-4e0307dcfc4674f733bbb3e93dbe15ae910258e2.tar.bz2 nixpkgs-4e0307dcfc4674f733bbb3e93dbe15ae910258e2.tar.lz nixpkgs-4e0307dcfc4674f733bbb3e93dbe15ae910258e2.tar.xz nixpkgs-4e0307dcfc4674f733bbb3e93dbe15ae910258e2.tar.zst nixpkgs-4e0307dcfc4674f733bbb3e93dbe15ae910258e2.zip | |
treewide: Make explicit that 'dev' output of cyrus_sasl is used
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/ekiga/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/ldap/389/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/mail/postfix/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix index da6bf44ced1..0823cb1eef7 100644 --- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix +++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix @@ -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" ]; diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index 95dc5ab8679..39667c8ba62 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -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}" ]; diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 75685d7605e..d75e2e05935 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -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" diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index da1fbef80df..fee3b991e1a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -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]; }; |