diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-08-24 20:43:48 -0400 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-08-24 20:43:48 -0400 |
commit | 3a35ba350f0153f4f7bb4eb006078c38b5ca94ec (patch) | |
tree | 16989d8203c9135c89ce362e260c8014f9dcc1b4 | |
parent | 681d659ee46e1048a61ec14d3def81445a5b2c9b (diff) |
Turn multipleOutputs into a stdenv adaptation
This way we can merge it into stdenv.mkDerivation later without having to modify any package expressions (except the overrides in all-packages.nix).
-rw-r--r-- | pkgs/applications/audio/flac/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/libogg/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/libsamplerate/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/libsndfile/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/libvorbis/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 24 |
6 files changed, 28 insertions, 16 deletions
diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix index 21025b27b2498..dedd3e0139a8f 100644 --- a/pkgs/applications/audio/flac/default.nix +++ b/pkgs/applications/audio/flac/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, multipleOutputs, libogg }: +{ stdenv, fetchurl, libogg }: -multipleOutputs rec { +stdenv.mkDerivation rec { name = "flac-1.2.1"; src = fetchurl { diff --git a/pkgs/development/libraries/libogg/default.nix b/pkgs/development/libraries/libogg/default.nix index d3e7ba43b31c7..e7e9f71eb6be4 100644 --- a/pkgs/development/libraries/libogg/default.nix +++ b/pkgs/development/libraries/libogg/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, multipleOutputs, xz }: +{ stdenv, fetchurl, xz }: -multipleOutputs rec { +stdenv.mkDerivation rec { name = "libogg-1.3.0"; src = fetchurl { diff --git a/pkgs/development/libraries/libsamplerate/default.nix b/pkgs/development/libraries/libsamplerate/default.nix index 7aeafeee66ace..0e2f042104d30 100644 --- a/pkgs/development/libraries/libsamplerate/default.nix +++ b/pkgs/development/libraries/libsamplerate/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, multipleOutputs, pkgconfig, libsndfile }: +{ stdenv, fetchurl, pkgconfig, libsndfile }: -multipleOutputs rec { +stdenv.mkDerivation rec { name = "libsamplerate-0.1.7"; src = fetchurl { diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix index 166e02668f04e..7140843a45364 100644 --- a/pkgs/development/libraries/libsndfile/default.nix +++ b/pkgs/development/libraries/libsndfile/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, multipleOutputs, flac, libogg, libvorbis, pkgconfig }: +{ stdenv, fetchurl, flac, libogg, libvorbis, pkgconfig }: -multipleOutputs rec { +stdenv.mkDerivation rec { name = "libsndfile-1.0.23"; src = fetchurl { diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix index dac0583723543..0a54adcada42c 100644 --- a/pkgs/development/libraries/libvorbis/default.nix +++ b/pkgs/development/libraries/libvorbis/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, multipleOutputs, libogg, xz }: +{ stdenv, fetchurl, libogg, xz }: -multipleOutputs rec { +stdenv.mkDerivation rec { name = "libvorbis-1.3.3"; src = fetchurl { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 53e83ca5798f7..deb9c626d5d35 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -327,7 +327,9 @@ let inherit stdenv perl cpio contents ubootChooser; }; - multipleOutputs = import ../build-support/multiple-outputs.nix { inherit (pkgs) stdenv; }; + stdenvMulti = stdenv // { + mkDerivation = import ../build-support/multiple-outputs.nix { inherit (pkgs) stdenv; }; + }; makeWrapper = makeSetupHook {} ../build-support/make-wrapper/make-wrapper.sh; @@ -4133,7 +4135,9 @@ let libQGLViewer = callPackage ../development/libraries/libqglviewer { }; - libsamplerate = callPackage ../development/libraries/libsamplerate { }; + libsamplerate = callPackage ../development/libraries/libsamplerate { + stdenv = stdenvMulti; + }; libspectre = callPackage ../development/libraries/libspectre { }; @@ -4226,7 +4230,9 @@ let libofx = callPackage ../development/libraries/libofx { }; - libogg = callPackage ../development/libraries/libogg { }; + libogg = callPackage ../development/libraries/libogg { + stdenv = stdenvMulti; + }; liboggz = callPackage ../development/libraries/liboggz { }; @@ -4267,7 +4273,9 @@ let # To bootstrap SBCL, I need CLisp 2.44.1; it needs libsigsegv 2.5 libsigsegv_25 = callPackage ../development/libraries/libsigsegv/2.5.nix { }; - libsndfile = callPackage ../development/libraries/libsndfile { }; + libsndfile = callPackage ../development/libraries/libsndfile { + stdenv = stdenvMulti; + }; libsoup = callPackage ../development/libraries/libsoup { }; @@ -4330,7 +4338,9 @@ let libvterm = callPackage ../development/libraries/libvterm { }; - libvorbis = callPackage ../development/libraries/libvorbis { }; + libvorbis = callPackage ../development/libraries/libvorbis { + stdenv = stdenvMulti; + }; libwebp = callPackage ../development/libraries/libwebp { }; @@ -6860,7 +6870,9 @@ let firefox13Wrapper = lowPrio (wrapFirefox { browser = firefox13Pkgs.firefox; }); - flac = callPackage ../applications/audio/flac { }; + flac = callPackage ../applications/audio/flac { + stdenv = stdenvMulti; + }; flashplayer = flashplayer11; |