diff --git a/pkgs/development/interpreters/xulrunner/wrapper/default.nix b/pkgs/development/interpreters/xulrunner/wrapper/default.nix index e6d3b20ef9df..5d0ccccc674c 100644 --- a/pkgs/development/interpreters/xulrunner/wrapper/default.nix +++ b/pkgs/development/interpreters/xulrunner/wrapper/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { builder = ./builder.sh; inherit xulrunner launcher; - appfile = application + /application.ini; + appfile = application + "/application.ini"; inherit (application) meta; } diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index d9463bbe75e3..19b9848309da 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -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; } diff --git a/pkgs/development/tools/misc/help2man/help2man-1.36.4.nix b/pkgs/development/tools/misc/help2man/help2man-1.36.4.nix index 6b113ad68bdd..7705265667bc 100644 --- a/pkgs/development/tools/misc/help2man/help2man-1.36.4.nix +++ b/pkgs/development/tools/misc/help2man/help2man-1.36.4.nix @@ -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; } diff --git a/pkgs/games/zoom/default.nix b/pkgs/games/zoom/default.nix index 129f431de8e1..71b4241582dc 100644 --- a/pkgs/games/zoom/default.nix +++ b/pkgs/games/zoom/default.nix @@ -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")]; } diff --git a/pkgs/misc/tex/nix/default.nix b/pkgs/misc/tex/nix/default.nix index 83b299ac82d2..81dfd8babc83 100644 --- a/pkgs/misc/tex/nix/default.nix +++ b/pkgs/misc/tex/nix/default.nix @@ -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 diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 55fb20534069..4eb5862186b0 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -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; diff --git a/pkgs/stdenv/mingw/default.nix b/pkgs/stdenv/mingw/default.nix index ae06ef133b44..66fc5064e490 100644 --- a/pkgs/stdenv/mingw/default.nix +++ b/pkgs/stdenv/mingw/default.nix @@ -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 diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix index 401ce2417b8f..0c9b0c8027a9 100644 --- a/pkgs/stdenv/nix/default.nix +++ b/pkgs/stdenv/nix/default.nix @@ -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;