* Remove references to substitute.sh.
svn path=/nixpkgs/trunk/; revision=7499
This commit is contained in:
parent
138c0ae751
commit
7a79d1ff6a
@ -1,5 +1,4 @@
|
|||||||
source $stdenv/setup
|
source $stdenv/setup
|
||||||
source $substitute
|
|
||||||
|
|
||||||
|
|
||||||
# Force gcc to use ld-wrapper.sh when calling ld.
|
# Force gcc to use ld-wrapper.sh when calling ld.
|
||||||
|
@ -15,7 +15,6 @@ assert !nativeLibc -> libc != null;
|
|||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
builder = ./builder.sh;
|
builder = ./builder.sh;
|
||||||
substitute = ../substitute/substitute.sh;
|
|
||||||
setupHook = ./setup-hook.sh;
|
setupHook = ./setup-hook.sh;
|
||||||
gccWrapper = ./gcc-wrapper.sh;
|
gccWrapper = ./gcc-wrapper.sh;
|
||||||
ldWrapper = ./ld-wrapper.sh;
|
ldWrapper = ./ld-wrapper.sh;
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
source $stdenv/setup
|
source $stdenv/setup
|
||||||
source $substituter
|
|
||||||
|
|
||||||
substitute $dllFixer $out --subst-var-by perl $perl/bin/perl
|
substitute $dllFixer $out --subst-var-by perl $perl/bin/perl
|
||||||
chmod +x $out
|
chmod +x $out
|
||||||
|
@ -3,7 +3,6 @@
|
|||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "mono-dll-fixer";
|
name = "mono-dll-fixer";
|
||||||
builder = ./builder.sh;
|
builder = ./builder.sh;
|
||||||
substituter = ../substitute/substitute.sh;
|
|
||||||
dllFixer = ./dll-fixer.pl;
|
dllFixer = ./dll-fixer.pl;
|
||||||
inherit perl;
|
inherit perl;
|
||||||
}
|
}
|
@ -1,5 +1,4 @@
|
|||||||
source $stdenv/setup
|
source $stdenv/setup
|
||||||
source $substitute
|
|
||||||
|
|
||||||
ensureDir $out/nix-support
|
ensureDir $out/nix-support
|
||||||
substitute "$hook" "$out/nix-support/setup-hook" --subst-var out
|
substitute "$hook" "$out/nix-support/setup-hook" --subst-var out
|
||||||
|
@ -19,7 +19,6 @@ stdenv.mkDerivation {
|
|||||||
name = "qt-3.3.6";
|
name = "qt-3.3.6";
|
||||||
|
|
||||||
builder = ./builder.sh;
|
builder = ./builder.sh;
|
||||||
substitute = ../../../build-support/substitute/substitute.sh;
|
|
||||||
hook = ./setup-hook.sh;
|
hook = ./setup-hook.sh;
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = http://nix.cs.uu.nl/dist/tarballs/qt-x11-free-3.3.6.tar.bz2;
|
url = http://nix.cs.uu.nl/dist/tarballs/qt-x11-free-3.3.6.tar.bz2;
|
||||||
|
Loading…
Reference in New Issue
Block a user