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

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -214,10 +214,10 @@ rec {
inherit (stdenvLinuxBoot2Pkgs) binutils;
glibc = stdenvLinuxGlibc;
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 = {
curl = stdenvLinuxBoot3Pkgs.realCurl;

View file

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

View file

@ -17,10 +17,10 @@ import ../generic {
else
pkgs.binutils;
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 = {
curl = pkgs.realCurl;