summary refs log tree commit diff
path: root/pkgs/development/compilers
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2010-01-15 10:05:29 +0000
committerMichael Raskin <7c6f434c@mail.ru>2010-01-15 10:05:29 +0000
commit164bb7e1d7ff309d6b5f70f23fb60853417362e6 (patch)
treec589b77b855c6d8868135caff070332dbd5f93ab /pkgs/development/compilers
parent62c0c25b2ad870249961b3fcf708c86bc694ee51 (diff)
downloadnixpkgs-164bb7e1d7ff309d6b5f70f23fb60853417362e6.tar
nixpkgs-164bb7e1d7ff309d6b5f70f23fb60853417362e6.tar.gz
nixpkgs-164bb7e1d7ff309d6b5f70f23fb60853417362e6.tar.bz2
nixpkgs-164bb7e1d7ff309d6b5f70f23fb60853417362e6.tar.lz
nixpkgs-164bb7e1d7ff309d6b5f70f23fb60853417362e6.tar.xz
nixpkgs-164bb7e1d7ff309d6b5f70f23fb60853417362e6.tar.zst
nixpkgs-164bb7e1d7ff309d6b5f70f23fb60853417362e6.zip
Copy ppc* independently of architecture
svn path=/nixpkgs/trunk/; revision=19461
Diffstat (limited to 'pkgs/development/compilers')
-rwxr-xr-xpkgs/development/compilers/fpc/binary-builder.sh7
-rw-r--r--pkgs/development/compilers/fpc/default.nix4
2 files changed, 4 insertions, 7 deletions
diff --git a/pkgs/development/compilers/fpc/binary-builder.sh b/pkgs/development/compilers/fpc/binary-builder.sh
index 16f1a0f761f..8be36dec73e 100755
--- a/pkgs/development/compilers/fpc/binary-builder.sh
+++ b/pkgs/development/compilers/fpc/binary-builder.sh
@@ -7,6 +7,7 @@ echo "Deploying binaries.."
 mkdir $out
 cd $out
 for i in $tarballdir/*.gz; do tar xvf $i; done
-echo "Creating ppc386 symlink.."
-ln -fs $out/lib/fpc/*/ppc386 $out/bin/ppc386
-
+echo 'Creating ppc* symlink..'
+for i in $out/lib/fpc/*/ppc*; do
+  ln -fs $i $out/bin/$(basename $i)
+done
diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix
index fe415758db5..2d6cadf07fd 100644
--- a/pkgs/development/compilers/fpc/default.nix
+++ b/pkgs/development/compilers/fpc/default.nix
@@ -20,10 +20,6 @@ stdenv.mkDerivation rec {
       sed -e "s@'/lib/ld-linux[^']*'@'''@" -i fpcsrc/compiler/systems/t_linux.pas
     '' else "";
 
-  preBuild = ''
-    fpcmake
-  '';
-
   makeFlags = "NOGDB=1";
 
   installFlags = "INSTALL_PREFIX=\${out}";