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 /pkgs/development | |
| 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).
Diffstat (limited to 'pkgs/development')
4 files changed, 8 insertions, 8 deletions
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 { |