public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into hardened-stdenv

Browse Source
This commit is contained in:
Robin Gloster
2016-05-30 19:39:34 +00:00
parent 365379857f 2661511cdb
commit 2d382f3d98
711 changed files with 49079 additions and 11672 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/interpreters/erlang/R16.nix
+1 -1
View File
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
sed -e s@/bin/pwd@pwd@g -i otp_build
'';
configureFlags= "--with-ssl=${openssl} ${optionalString odbcSupport "--with-odbc=${unixODBC}"} ${optionalString stdenv.isDarwin "--enable-darwin-64bit"}";
configureFlags= "--with-ssl=${openssl.dev} ${optionalString odbcSupport "--with-odbc=${unixODBC}"} ${optionalString stdenv.isDarwin "--enable-darwin-64bit"}";
postInstall = let
manpages = fetchurl {
pkgs/development/interpreters/erlang/R17.nix
+1 -1
View File
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
'';
configureFlags= [
"--with-ssl=${openssl}"
"--with-ssl=${openssl.dev}"
] ++ optional enableHipe "--enable-hipe"
++ optional wxSupport "--enable-wx"
++ optional odbcSupport "--with-odbc=${unixODBC}"
pkgs/development/interpreters/erlang/R18.nix
+1 -1
View File
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
'';
configureFlags= [
"--with-ssl=${openssl}"
"--with-ssl=${openssl.dev}"
] ++ optional enableHipe "--enable-hipe"
++ optional wxSupport "--enable-wx"
++ optional odbcSupport "--with-odbc=${unixODBC}"