diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-09-01 13:27:27 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-09-01 13:27:27 +0300 |
| commit | 8c4aeb17808e6d33515bb9178eaca942c588b31d (patch) | |
| tree | 202a33b2dd86ab28d168778b313f184a9ecc0bda /pkgs/development/interpreters | |
| parent | 003ab1d9fdaf2818a1e5a6e53825d31ac2e23621 (diff) | |
| parent | 838c75398cc46cf2acbe144b1f3866d736abe430 (diff) | |
| download | nixlib-8c4aeb17808e6d33515bb9178eaca942c588b31d.tar nixlib-8c4aeb17808e6d33515bb9178eaca942c588b31d.tar.gz nixlib-8c4aeb17808e6d33515bb9178eaca942c588b31d.tar.bz2 nixlib-8c4aeb17808e6d33515bb9178eaca942c588b31d.tar.lz nixlib-8c4aeb17808e6d33515bb9178eaca942c588b31d.tar.xz nixlib-8c4aeb17808e6d33515bb9178eaca942c588b31d.tar.zst nixlib-8c4aeb17808e6d33515bb9178eaca942c588b31d.zip | |
Merge staging into master
Brings in:
- changed output order for multiple outputs:
https://github.com/NixOS/nixpkgs/pull/14766
- audit disabled by default
https://github.com/NixOS/nixpkgs/pull/17916
Conflicts:
pkgs/development/libraries/openldap/default.nix
Diffstat (limited to 'pkgs/development/interpreters')
6 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/development/interpreters/erlang/R14.nix b/pkgs/development/interpreters/erlang/R14.nix index cf4355a38e16..be7d775a6680 100644 --- a/pkgs/development/interpreters/erlang/R14.nix +++ b/pkgs/development/interpreters/erlang/R14.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { sed -e s@/bin/pwd@pwd@g -i otp_build ''; - configureFlags = "--with-ssl=${openssl}"; + configureFlags = "--with-ssl=${openssl.dev}"; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 7c1fe8f29674..9ae5865b0d7f 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -108,12 +108,12 @@ let mysql = { configureFlags = ["--with-mysql"]; - buildInputs = [ mysql.lib ]; + buildInputs = [ mysql.lib.dev ]; }; mysqli = { - configureFlags = ["--with-mysqli=${mysql.lib}/bin/mysql_config"]; - buildInputs = [ mysql.lib ]; + configureFlags = ["--with-mysqli=${mysql.lib.dev}/bin/mysql_config"]; + buildInputs = [ mysql.lib.dev ]; }; mysqli_embedded = { @@ -123,8 +123,8 @@ let }; pdo_mysql = { - configureFlags = ["--with-pdo-mysql=${mysql.lib}"]; - buildInputs = [ mysql.lib ]; + configureFlags = ["--with-pdo-mysql=${mysql.lib.dev}"]; + buildInputs = [ mysql.lib.dev ]; }; bcmath = { diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index a337b28859b7..3269a3c9684f 100644 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation { export MACOSX_DEPLOYMENT_TARGET=10.6 ''} - substituteInPlace ./Lib/plat-generic/regen --replace "/usr/include" ${glibc}/include + substituteInPlace ./Lib/plat-generic/regen --replace "/usr/include" ${glibc.dev}/include configureFlagsArray=( --enable-shared --with-threads CPPFLAGS="${concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs)}" diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 446013faafdc..51f16360f8bf 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -156,7 +156,7 @@ let baseRuby = baseruby; libPath = "lib/${rubyEngine}/${versionNoPatch}"; gemPath = "lib/${rubyEngine}/gems/${versionNoPatch}"; - dev = import ./dev.nix { + devEnv = import ./dev.nix { inherit buildEnv bundler bundix; ruby = self; }; diff --git a/pkgs/development/interpreters/spidermonkey/17.0.nix b/pkgs/development/interpreters/spidermonkey/17.0.nix index 330d8e334acc..d9cc7775d090 100644 --- a/pkgs/development/interpreters/spidermonkey/17.0.nix +++ b/pkgs/development/interpreters/spidermonkey/17.0.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1fig2wf4f10v43mqx67y68z6h77sy900d1w0pz9qarrqx57rc7ij"; }; - outputs = [ "dev" "out" "lib" ]; + outputs = [ "out" "dev" "lib" ]; propagatedBuildInputs = [ nspr ]; diff --git a/pkgs/development/interpreters/spidermonkey/24.2.nix b/pkgs/development/interpreters/spidermonkey/24.2.nix index 13257a3eb338..d207fbd10704 100644 --- a/pkgs/development/interpreters/spidermonkey/24.2.nix +++ b/pkgs/development/interpreters/spidermonkey/24.2.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1n1phk8r3l8icqrrap4czplnylawa0ddc2cc4cgdz46x3lrkybz6"; }; - outputs = [ "dev" "out" "lib" ]; + outputs = [ "out" "dev" "lib" ]; propagatedBuildInputs = [ nspr ]; |