diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-10-17 14:06:18 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-10-17 14:06:18 +0000 |
commit | 76405f2b7fc80cd1524a2e8e33e82f53b383d25f (patch) | |
tree | 625e6f333b820733d872752b95a0eab97b814f85 /pkgs/stdenv/mingw | |
parent | 76125fb2bc0ec33715ae077f8113ec9c73397a9d (diff) | |
download | nixlib-76405f2b7fc80cd1524a2e8e33e82f53b383d25f.tar nixlib-76405f2b7fc80cd1524a2e8e33e82f53b383d25f.tar.gz nixlib-76405f2b7fc80cd1524a2e8e33e82f53b383d25f.tar.bz2 nixlib-76405f2b7fc80cd1524a2e8e33e82f53b383d25f.tar.lz nixlib-76405f2b7fc80cd1524a2e8e33e82f53b383d25f.tar.xz nixlib-76405f2b7fc80cd1524a2e8e33e82f53b383d25f.tar.zst nixlib-76405f2b7fc80cd1524a2e8e33e82f53b383d25f.zip |
* `drv + /path' is deprecated, so don't do that anymore.
svn path=/nixpkgs/trunk/; revision=6754
Diffstat (limited to 'pkgs/stdenv/mingw')
-rw-r--r-- | pkgs/stdenv/mingw/default.nix | 18 |
1 files changed, 9 insertions, 9 deletions
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 |