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

* `drv + /path' is deprecated, so don't do that anymore.

Browse Source 
svn path=/nixpkgs/trunk/; revision=6754
This commit is contained in:
Eelco Dolstra 2006-10-17 14:06:18 +00:00
parent 76125fb2bc
commit 76405f2b7f
8 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/interpreters/xulrunner/wrapper/default.nix
View File

@ -5,7 +5,7 @@ stdenv.mkDerivation {
builder = ./builder.sh; builder = ./builder.sh;
inherit xulrunner launcher; inherit xulrunner launcher;
appfile = application + /application.ini; appfile = application + "/application.ini";
inherit (application) meta; inherit (application) meta;
} }

2
pkgs/development/tools/misc/help2man/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation {
]; ];
# So that configure can find `preloadable_libintl.so'. # So that configure can find `preloadable_libintl.so'.
LD_LIBRARY_PATH = gettext + /lib; LD_LIBRARY_PATH = gettext + "/lib";
inherit gettext; inherit gettext;
} }

2
pkgs/development/tools/misc/help2man/help2man-1.36.4.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation {
]; ];
# So that configure can find `preloadable_libintl.so'. # So that configure can find `preloadable_libintl.so'.
LD_LIBRARY_PATH = gettext + /lib; LD_LIBRARY_PATH = gettext + "/lib";
inherit gettext; inherit gettext;
} }

2
pkgs/games/zoom/default.nix
View File

@ -10,5 +10,5 @@ stdenv.mkDerivation {
}; };
buildInputs = [perl expat xlibs freetype]; buildInputs = [perl expat xlibs freetype];
# Zoom doesn't add the right directory in the include path. # Zoom doesn't add the right directory in the include path.
CFLAGS = ["-I" (freetype + /include/freetype2)]; CFLAGS = ["-I" (freetype + "/include/freetype2")];
} }

2
pkgs/misc/tex/nix/default.nix
View File

@ -32,7 +32,7 @@ rec {
pkgs.stdenv.mkDerivation { pkgs.stdenv.mkDerivation {
name = "latex-includes"; name = "latex-includes";
realBuilder = pkgs.perl + /bin/perl; realBuilder = pkgs.perl + "/bin/perl";
args = [ ./find-includes.pl ]; args = [ ./find-includes.pl ];
rootFile = toString rootFile; # !!! hacky rootFile = toString rootFile; # !!! hacky

4
pkgs/stdenv/linux/default.nix
View File

@ -214,10 +214,10 @@ rec {
inherit (stdenvLinuxBoot2Pkgs) binutils; inherit (stdenvLinuxBoot2Pkgs) binutils;
glibc = stdenvLinuxGlibc; glibc = stdenvLinuxGlibc;
gcc = stdenvLinuxBoot2Pkgs.gcc.gcc; gcc = stdenvLinuxBoot2Pkgs.gcc.gcc;
shell = stdenvLinuxBoot3Pkgs.bash + /bin/sh; shell = stdenvLinuxBoot3Pkgs.bash + "/bin/sh";
}; };
shell = stdenvLinuxBoot3Pkgs.bash + /bin/sh; shell = stdenvLinuxBoot3Pkgs.bash + "/bin/sh";
extraAttrs = { extraAttrs = {
curl = stdenvLinuxBoot3Pkgs.realCurl; curl = stdenvLinuxBoot3Pkgs.realCurl;

18
pkgs/stdenv/mingw/default.nix
View File

@ -25,7 +25,7 @@ let {
inherit system; inherit system;
name = "stdenv-init2-mingw"; name = "stdenv-init2-mingw";
shell = msysShell; shell = msysShell;
path = [(msys + /bin)]; path = [(msys + "/bin")];
}; };
/** /**
@ -37,12 +37,12 @@ let {
name = "stdenv-init3-mingw"; name = "stdenv-init3-mingw";
shell = msysShell; shell = msysShell;
path = [ path = [
(make + /bin) (make + "/bin")
(binutils + /bin) (binutils + "/bin")
(gccCore + /bin) (gccCore + "/bin")
(mingwRuntimeBin + /bin) (mingwRuntimeBin + "/bin")
(w32apiBin + /bin) (w32apiBin + "/bin")
(msys + /bin) (msys + "/bin")
]; ];
extraEnv = { extraEnv = {
@ -65,7 +65,7 @@ let {
}; };
shell = shell =
msys + /bin/sh + ".exe"; msys + "/bin/sh.exe";
stdenv = stdenv =
stdenvInit2.mkDerivation { stdenvInit2.mkDerivation {
@ -158,7 +158,7 @@ let {
}; };
msysShell = msysShell =
msys + /bin/sh + ".exe"; msys + "/bin/sh.exe";
/** /**
* Binary packages, based on stdenvInit2 * Binary packages, based on stdenvInit2

4
pkgs/stdenv/nix/default.nix
View File

@ -17,10 +17,10 @@ import ../generic {
else else
pkgs.binutils; pkgs.binutils;
gcc = if stdenv.isDarwin then pkgs.gccApple.gcc else pkgs.gcc.gcc; gcc = if stdenv.isDarwin then pkgs.gccApple.gcc else pkgs.gcc.gcc;
shell = pkgs.bash + /bin/sh; shell = pkgs.bash + "/bin/sh";
}; };
shell = pkgs.bash + /bin/sh; shell = pkgs.bash + "/bin/sh";
extraAttrs = { extraAttrs = {
curl = pkgs.realCurl; curl = pkgs.realCurl;