Author: eelco Date: Mon May 7 02:06:29 2012 New Revision: 34002 URL: https://nixos.org/websvn/nix/?rev=34002&sc=1
Log: * Cygwin: provide a Perl setup hook so that Perl dependencies work properly. Added: nixpkgs/trunk/pkgs/development/interpreters/perl/sys-perl/ - copied from r33987, nixpkgs/trunk/pkgs/development/interpreters/sys-perl/ nixpkgs/trunk/pkgs/development/interpreters/perl/sys-perl/setup-hook.sh - copied, changed from r33987, nixpkgs/trunk/pkgs/development/interpreters/perl/5.14/setup-hook.sh Deleted: nixpkgs/trunk/pkgs/development/interpreters/perl/sys-perl/builder.sh nixpkgs/trunk/pkgs/development/interpreters/sys-perl/ Modified: nixpkgs/trunk/pkgs/development/interpreters/perl/sys-perl/default.nix nixpkgs/trunk/pkgs/top-level/all-packages.nix Modified: nixpkgs/trunk/pkgs/development/interpreters/perl/sys-perl/default.nix ============================================================================== --- nixpkgs/trunk/pkgs/development/interpreters/sys-perl/default.nix Sat May 5 14:26:20 2012 (r33987) +++ nixpkgs/trunk/pkgs/development/interpreters/perl/sys-perl/default.nix Mon May 7 02:06:29 2012 (r34002) @@ -1,6 +1,15 @@ -{stdenv}: +{ stdenv }: stdenv.mkDerivation { name = "perl"; - builder = ./builder.sh; + + unpackPhase = "true"; + + installPhase = + '' + mkdir -p $out/bin + ln -s /usr/bin/perl $out/bin + ''; + + setupHook = ./setup-hook.sh; } Copied and modified: nixpkgs/trunk/pkgs/development/interpreters/perl/sys-perl/setup-hook.sh (from r33987, nixpkgs/trunk/pkgs/development/interpreters/perl/5.14/setup-hook.sh) ============================================================================== --- nixpkgs/trunk/pkgs/development/interpreters/perl/5.14/setup-hook.sh Sat May 5 14:26:20 2012 (r33987, copy source) +++ nixpkgs/trunk/pkgs/development/interpreters/perl/sys-perl/setup-hook.sh Mon May 7 02:06:29 2012 (r34002) @@ -1,5 +1,5 @@ addPerlLibPath () { - addToSearchPath PERL5LIB $1/lib/perl5/site_perl + addToSearchPath PERL5LIB $1/lib/perl5/site_perl/5.10/i686-cygwin } envHooks=(${envHooks[@]} addPerlLibPath) Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix ============================================================================== --- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon May 7 01:08:33 2012 (r34001) +++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon May 7 02:06:29 2012 (r34002) @@ -2816,7 +2816,7 @@ spidermonkey_1_8_0rc1 = callPackage ../development/interpreters/spidermonkey/1.8.0-rc1.nix { }; spidermonkey_185 = callPackage ../development/interpreters/spidermonkey/185-1.0.0.nix { }; - sysPerl = callPackage ../development/interpreters/sys-perl { }; + sysPerl = callPackage ../development/interpreters/perl/sys-perl { }; tcl = callPackage ../development/interpreters/tcl { }; _______________________________________________ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits