diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-12-27 18:17:53 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-12-27 18:17:53 +0000 |
| commit | 7a79d1ff6a6a0b342cc33aff94446af601a825b2 (patch) | |
| tree | 8c9bdec7a4608e0af313d46c9f544f1a6f161aa3 | |
| parent | 138c0ae751174ae6859589a9c9d517e45c14dc18 (diff) | |
| download | nixpkgs-7a79d1ff6a6a0b342cc33aff94446af601a825b2.tar nixpkgs-7a79d1ff6a6a0b342cc33aff94446af601a825b2.tar.gz nixpkgs-7a79d1ff6a6a0b342cc33aff94446af601a825b2.tar.bz2 nixpkgs-7a79d1ff6a6a0b342cc33aff94446af601a825b2.tar.lz nixpkgs-7a79d1ff6a6a0b342cc33aff94446af601a825b2.tar.xz nixpkgs-7a79d1ff6a6a0b342cc33aff94446af601a825b2.tar.zst nixpkgs-7a79d1ff6a6a0b342cc33aff94446af601a825b2.zip | |
* Remove references to substitute.sh.
svn path=/nixpkgs/trunk/; revision=7499
| -rw-r--r-- | pkgs/build-support/gcc-cross-wrapper/builder.sh | 1 | ||||
| -rw-r--r-- | pkgs/build-support/gcc-cross-wrapper/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/build-support/mono-dll-fixer/builder.sh | 1 | ||||
| -rw-r--r-- | pkgs/build-support/mono-dll-fixer/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-3/builder.sh | 1 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-3/default.nix | 1 |
6 files changed, 0 insertions, 6 deletions
diff --git a/pkgs/build-support/gcc-cross-wrapper/builder.sh b/pkgs/build-support/gcc-cross-wrapper/builder.sh index ff4a9848ec1..0e8aa69fa8e 100644 --- a/pkgs/build-support/gcc-cross-wrapper/builder.sh +++ b/pkgs/build-support/gcc-cross-wrapper/builder.sh @@ -1,5 +1,4 @@ source $stdenv/setup -source $substitute # Force gcc to use ld-wrapper.sh when calling ld. diff --git a/pkgs/build-support/gcc-cross-wrapper/default.nix b/pkgs/build-support/gcc-cross-wrapper/default.nix index 9be44f9b466..74d15660da8 100644 --- a/pkgs/build-support/gcc-cross-wrapper/default.nix +++ b/pkgs/build-support/gcc-cross-wrapper/default.nix @@ -15,7 +15,6 @@ assert !nativeLibc -> libc != null; stdenv.mkDerivation { builder = ./builder.sh; - substitute = ../substitute/substitute.sh; setupHook = ./setup-hook.sh; gccWrapper = ./gcc-wrapper.sh; ldWrapper = ./ld-wrapper.sh; diff --git a/pkgs/build-support/mono-dll-fixer/builder.sh b/pkgs/build-support/mono-dll-fixer/builder.sh index 6b1e9e47549..67abc465a9b 100644 --- a/pkgs/build-support/mono-dll-fixer/builder.sh +++ b/pkgs/build-support/mono-dll-fixer/builder.sh @@ -1,5 +1,4 @@ source $stdenv/setup -source $substituter substitute $dllFixer $out --subst-var-by perl $perl/bin/perl chmod +x $out diff --git a/pkgs/build-support/mono-dll-fixer/default.nix b/pkgs/build-support/mono-dll-fixer/default.nix index d1d856235da..f7dbeb3c2b0 100644 --- a/pkgs/build-support/mono-dll-fixer/default.nix +++ b/pkgs/build-support/mono-dll-fixer/default.nix @@ -3,7 +3,6 @@ stdenv.mkDerivation { name = "mono-dll-fixer"; builder = ./builder.sh; - substituter = ../substitute/substitute.sh; dllFixer = ./dll-fixer.pl; inherit perl; } \ No newline at end of file diff --git a/pkgs/development/libraries/qt-3/builder.sh b/pkgs/development/libraries/qt-3/builder.sh index 8081d2d547e..b403f036b0e 100644 --- a/pkgs/development/libraries/qt-3/builder.sh +++ b/pkgs/development/libraries/qt-3/builder.sh @@ -1,5 +1,4 @@ source $stdenv/setup -source $substitute ensureDir $out/nix-support substitute "$hook" "$out/nix-support/setup-hook" --subst-var out diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index 05e5936bddf..f0b8b85643f 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation { name = "qt-3.3.6"; builder = ./builder.sh; - substitute = ../../../build-support/substitute/substitute.sh; hook = ./setup-hook.sh; src = fetchurl { url = http://nix.cs.uu.nl/dist/tarballs/qt-x11-free-3.3.6.tar.bz2; |