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

Turn multipleOutputs into a stdenv adaptation

Browse Source 
This way we can merge it into stdenv.mkDerivation later without having
to modify any package expressions (except the overrides in
all-packages.nix).
This commit is contained in:
Eelco Dolstra 2012-08-24 20:43:48 -04:00
parent 681d659ee4
commit 3a35ba350f
6 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/audio/flac/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, multipleOutputs, libogg }: { stdenv, fetchurl, libogg }:
multipleOutputs rec { stdenv.mkDerivation rec {
name = "flac-1.2.1"; name = "flac-1.2.1";
src = fetchurl { src = fetchurl {

4
pkgs/development/libraries/libogg/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, multipleOutputs, xz }: { stdenv, fetchurl, xz }:
multipleOutputs rec { stdenv.mkDerivation rec {
name = "libogg-1.3.0"; name = "libogg-1.3.0";
src = fetchurl { src = fetchurl {

4
pkgs/development/libraries/libsamplerate/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, multipleOutputs, pkgconfig, libsndfile }: { stdenv, fetchurl, pkgconfig, libsndfile }:
multipleOutputs rec { stdenv.mkDerivation rec {
name = "libsamplerate-0.1.7"; name = "libsamplerate-0.1.7";
src = fetchurl { src = fetchurl {

4
pkgs/development/libraries/libsndfile/default.nix
View File

@ -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"; name = "libsndfile-1.0.23";
src = fetchurl { src = fetchurl {

4
pkgs/development/libraries/libvorbis/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, multipleOutputs, libogg, xz }: { stdenv, fetchurl, libogg, xz }:
multipleOutputs rec { stdenv.mkDerivation rec {
name = "libvorbis-1.3.3"; name = "libvorbis-1.3.3";
src = fetchurl { src = fetchurl {

24
pkgs/top-level/all-packages.nix
View File

@ -327,7 +327,9 @@ let
inherit stdenv perl cpio contents ubootChooser; 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; makeWrapper = makeSetupHook {} ../build-support/make-wrapper/make-wrapper.sh;
@ -4133,7 +4135,9 @@ let
libQGLViewer = callPackage ../development/libraries/libqglviewer { }; libQGLViewer = callPackage ../development/libraries/libqglviewer { };
libsamplerate = callPackage ../development/libraries/libsamplerate { }; libsamplerate = callPackage ../development/libraries/libsamplerate {
stdenv = stdenvMulti;
};
libspectre = callPackage ../development/libraries/libspectre { }; libspectre = callPackage ../development/libraries/libspectre { };
@ -4226,7 +4230,9 @@ let
libofx = callPackage ../development/libraries/libofx { }; libofx = callPackage ../development/libraries/libofx { };
libogg = callPackage ../development/libraries/libogg { }; libogg = callPackage ../development/libraries/libogg {
stdenv = stdenvMulti;
};
liboggz = callPackage ../development/libraries/liboggz { }; liboggz = callPackage ../development/libraries/liboggz { };
@ -4267,7 +4273,9 @@ let
# To bootstrap SBCL, I need CLisp 2.44.1; it needs libsigsegv 2.5 # To bootstrap SBCL, I need CLisp 2.44.1; it needs libsigsegv 2.5
libsigsegv_25 = callPackage ../development/libraries/libsigsegv/2.5.nix { }; 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 { }; libsoup = callPackage ../development/libraries/libsoup { };
@ -4330,7 +4338,9 @@ let
libvterm = callPackage ../development/libraries/libvterm { }; libvterm = callPackage ../development/libraries/libvterm { };
libvorbis = callPackage ../development/libraries/libvorbis { }; libvorbis = callPackage ../development/libraries/libvorbis {
stdenv = stdenvMulti;
};
libwebp = callPackage ../development/libraries/libwebp { }; libwebp = callPackage ../development/libraries/libwebp { };
@ -6860,7 +6870,9 @@ let
firefox13Wrapper = lowPrio (wrapFirefox { browser = firefox13Pkgs.firefox; }); firefox13Wrapper = lowPrio (wrapFirefox { browser = firefox13Pkgs.firefox; });
flac = callPackage ../applications/audio/flac { }; flac = callPackage ../applications/audio/flac {
stdenv = stdenvMulti;
};
flashplayer = flashplayer11; flashplayer = flashplayer11;