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

cygwin: build perl as usual, no sysPerl

Browse Source
This commit is contained in:
Florian Friesdorf 2014-10-23 16:14:48 +02:00 committed by Rok Garbas
parent 88e58a4fa2
commit ebf6d98fc2
3 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/development/interpreters/perl/sys-perl/default.nix
View File

@ -1,19 +0,0 @@
{ stdenv }:
stdenv.mkDerivation rec {
name = "perl";
unpackPhase = "true";
installPhase =
''
mkdir -p $out/bin
ln -s /usr/bin/perl $out/bin
'';
setupHook = ./setup-hook.sh;
libPrefix = "lib/perl5/site_perl/5.10/i686-cygwin";
passthru.libPrefix = libPrefix;
}

5
pkgs/development/interpreters/perl/sys-perl/setup-hook.sh
View File

@ -1,5 +0,0 @@
addPerlLibPath () {
addToSearchPath PERL5LIB $1/@libPrefix@
}
envHooks+=(addPerlLibPath)

4
pkgs/top-level/all-packages.nix
View File

@ -4807,7 +4807,7 @@ let
fetchurl = fetchurlBoot; fetchurl = fetchurlBoot;
}; };
perl = if system != "i686-cygwin" then perl520 else sysPerl; perl = perl520;
php = php56; php = php56;
@ -4965,8 +4965,6 @@ let
supercollider_scel = supercollider.override { useSCEL = true; }; supercollider_scel = supercollider.override { useSCEL = true; };
sysPerl = callPackage ../development/interpreters/perl/sys-perl { };
tcl = tcl-8_6; tcl = tcl-8_6;
tcl-8_5 = callPackage ../development/interpreters/tcl/8.5.nix { }; tcl-8_5 = callPackage ../development/interpreters/tcl/8.5.nix { };
tcl-8_6 = callPackage ../development/interpreters/tcl/8.6.nix { }; tcl-8_6 = callPackage ../development/interpreters/tcl/8.6.nix { };