diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-10-02 10:36:47 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-10-02 10:36:47 +0300 |
| commit | 19225bf5cc546b1608eea3f1770f1ee1110c14c8 (patch) | |
| tree | e95881d505d9cf1f309f8e6b2fbee40496f550cd /pkgs/development/interpreters | |
| parent | 97bfc2fac92d90c668ae1ec078356d0bd0a9ddb7 (diff) | |
| parent | a387a5d870c306220d6dfd06160bddde8532422d (diff) | |
| download | nixlib-19225bf5cc546b1608eea3f1770f1ee1110c14c8.tar nixlib-19225bf5cc546b1608eea3f1770f1ee1110c14c8.tar.gz nixlib-19225bf5cc546b1608eea3f1770f1ee1110c14c8.tar.bz2 nixlib-19225bf5cc546b1608eea3f1770f1ee1110c14c8.tar.lz nixlib-19225bf5cc546b1608eea3f1770f1ee1110c14c8.tar.xz nixlib-19225bf5cc546b1608eea3f1770f1ee1110c14c8.tar.zst nixlib-19225bf5cc546b1608eea3f1770f1ee1110c14c8.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/erlang/R16.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/erlang/R16.nix b/pkgs/development/interpreters/erlang/R16.nix index 02f9d1f98e81..ed30fe1522bf 100644 --- a/pkgs/development/interpreters/erlang/R16.nix +++ b/pkgs/development/interpreters/erlang/R16.nix @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { buildInputs = [ perl gnum4 ncurses openssl makeWrapper - ] ++ optional wxSupport [ mesa wxGTK xorg.libX11 ] - ++ optional odbcSupport [ unixODBC ] - ++ optional stdenv.isDarwin [ Carbon Cocoa ]; + ] ++ optionals wxSupport [ mesa wxGTK xorg.libX11 ] + ++ optional odbcSupport unixODBC + ++ optionals stdenv.isDarwin [ Carbon Cocoa ]; patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; |