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

* Don't use the subpath operator (~) anymore, it's subsumed by normal

Browse Source 
concatenation (+).

svn path=/nixpkgs/trunk/; revision=6080
This commit is contained in:
Eelco Dolstra 2006-08-09 15:05:30 +00:00
parent d9ec01e77f
commit bf1e734f85
9 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/networking/browsers/firefox-wrapper/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation {
# Let each plugin tell us (through its `mozillaPlugin') attribute # Let each plugin tell us (through its `mozillaPlugin') attribute
# where to find the plugin in its tree. # where to find the plugin in its tree.
plugins = map (x: x ~ x.mozillaPlugin) plugins; plugins = map (x: x + x.mozillaPlugin) plugins;
meta = { meta = {
description = firefox.meta.description + " (with various plugins)"; description = firefox.meta.description + " (with various plugins)";

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

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

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

@ -210,10 +210,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;

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;

6
pkgs/tools/networking/p2p/bittorrent/default.nix
View File

@ -1,11 +1,11 @@
{stdenv, fetchurl, python, pygtk, makeWrapper}: {stdenv, fetchurl, python, pygtk, makeWrapper}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "bittorrent-4.4.0"; name = "bittorrent-4.9.8";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = http://www.bittorrent.com/dl/BitTorrent-4.4.0.tar.gz; url = http://download.bittorrent.com/dl/BitTorrent-4.9.8.tar.gz;
md5 = "74d4b48202c28f0b27e989b6d5f5b214"; md5 = "30d14135a8c6869976cd807db019dfd9";
}; };
buildInputs = [python pygtk]; buildInputs = [python pygtk];
inherit python pygtk makeWrapper; inherit python pygtk makeWrapper;