diff options
| author | Marc Weber <marco-oweber@gmx.de> | 2009-05-19 23:25:58 +0000 |
|---|---|---|
| committer | Marc Weber <marco-oweber@gmx.de> | 2009-05-19 23:25:58 +0000 |
| commit | 52647ea3b08e24623ef32b303a4815467e1144e3 (patch) | |
| tree | 94635a356ecae478695d3c25fc0416db92bad54d /pkgs/development/compilers | |
| parent | 1500252e6fa30fc8b615587bc13a8f470b071586 (diff) | |
| download | nixlib-52647ea3b08e24623ef32b303a4815467e1144e3.tar nixlib-52647ea3b08e24623ef32b303a4815467e1144e3.tar.gz nixlib-52647ea3b08e24623ef32b303a4815467e1144e3.tar.bz2 nixlib-52647ea3b08e24623ef32b303a4815467e1144e3.tar.lz nixlib-52647ea3b08e24623ef32b303a4815467e1144e3.tar.xz nixlib-52647ea3b08e24623ef32b303a4815467e1144e3.tar.zst nixlib-52647ea3b08e24623ef32b303a4815467e1144e3.zip | |
FullDepEntry -> fullDepEntry, PackEntry -> packEntry
svn path=/nixpkgs/trunk/; revision=15662
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/fpc/lazarus.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/llvm-gcc.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/compilers/qi/9.1.nix | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix index 7186563eafc5..8846a82bc7bb 100644 --- a/pkgs/development/compilers/fpc/lazarus.nix +++ b/pkgs/development/compilers/fpc/lazarus.nix @@ -19,7 +19,7 @@ rec { /* doConfigure should be specified separately */ phaseNames = ["preBuild" "doMakeInstall" "postInstall"]; - preBuild = FullDepEntry ('' + preBuild = fullDepEntry ('' export NIX_LDFLAGS='-lXi -lX11 -lglib -lgtk -lgdk -lgdk_pixbuf -lc -lXext' ensureDir $out/share tar xf ${fpc.src} --strip-components=1 -C $out/share @@ -27,7 +27,7 @@ rec { '') ["minInit" "defEnsureDir" "doUnpack"]; - postInstall = FullDepEntry ('' + postInstall = fullDepEntry ('' wrapProgram $out/bin/startlazarus --prefix NIX_LDFLAGS ' ' "'$NIX_LDFLAGS'" '') ["doMakeInstall" "minInit" "defEnsureDir"]; diff --git a/pkgs/development/compilers/llvm/llvm-gcc.nix b/pkgs/development/compilers/llvm/llvm-gcc.nix index 20090d4b1c6c..a1f5e031ebad 100644 --- a/pkgs/development/compilers/llvm/llvm-gcc.nix +++ b/pkgs/development/compilers/llvm/llvm-gcc.nix @@ -14,7 +14,7 @@ rec { patches = [ ./no-sys-dirs.patch ]; - preConfigure = FullDepEntry ('' + preConfigure = fullDepEntry ('' sed -e 's,^LLVMSRCDIR.*,LLVMSRCDIR := dummy,' \ -e 's,\$(LLVMSRCDIR)/include,${llvm}/include,g' \ @@ -53,7 +53,7 @@ rec { '') ["doUnpack" "minInit"]; configureCommand = "$(ls ../llvm-gcc*.*.source/configure)"; - postInstall = FullDepEntry ('' + postInstall = fullDepEntry ('' mv $out/bin/gcc $out/bin/llvm-gcc mv $out/bin/g++ $out/bin/llvm-g++ '')["doMakeInstall" "minInit"]; diff --git a/pkgs/development/compilers/qi/9.1.nix b/pkgs/development/compilers/qi/9.1.nix index a1c9670be84f..8b218d499c53 100644 --- a/pkgs/development/compilers/qi/9.1.nix +++ b/pkgs/development/compilers/qi/9.1.nix @@ -13,7 +13,7 @@ let shell=stdenv.shell; in let - allBuild = FullDepEntry (" + allBuild = fullDepEntry (" (sleep 0.1; echo ) | clisp install.txt; (sleep 0.1; echo -e '1\n(quit)\n' ) | sh Qi-Linux-CLisp ensureDir \$out/share |