mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-22 14:45:27 +00:00
cygwin: build perl as usual, no sysPerl
This commit is contained in:
parent
88e58a4fa2
commit
ebf6d98fc2
|
@ -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;
|
||||
}
|
|
@ -1,5 +0,0 @@
|
|||
addPerlLibPath () {
|
||||
addToSearchPath PERL5LIB $1/@libPrefix@
|
||||
}
|
||||
|
||||
envHooks+=(addPerlLibPath)
|
|
@ -4807,7 +4807,7 @@ let
|
|||
fetchurl = fetchurlBoot;
|
||||
};
|
||||
|
||||
perl = if system != "i686-cygwin" then perl520 else sysPerl;
|
||||
perl = perl520;
|
||||
|
||||
php = php56;
|
||||
|
||||
|
@ -4965,8 +4965,6 @@ let
|
|||
|
||||
supercollider_scel = supercollider.override { useSCEL = true; };
|
||||
|
||||
sysPerl = callPackage ../development/interpreters/perl/sys-perl { };
|
||||
|
||||
tcl = tcl-8_6;
|
||||
tcl-8_5 = callPackage ../development/interpreters/tcl/8.5.nix { };
|
||||
tcl-8_6 = callPackage ../development/interpreters/tcl/8.6.nix { };
|
||||
|
|
Loading…
Reference in a new issue