From 08b6b9fa3a7e8588f038ce01c0c0614eac5ec915 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 7 May 2012 02:06:29 +0000 Subject: * Cygwin: provide a Perl setup hook so that Perl dependencies work properly. svn path=/nixpkgs/trunk/; revision=34002 --- pkgs/development/interpreters/perl/sys-perl/default.nix | 15 +++++++++++++++ pkgs/development/interpreters/perl/sys-perl/setup-hook.sh | 5 +++++ pkgs/development/interpreters/sys-perl/builder.sh | 4 ---- pkgs/development/interpreters/sys-perl/default.nix | 6 ------ 4 files changed, 20 insertions(+), 10 deletions(-) create mode 100644 pkgs/development/interpreters/perl/sys-perl/default.nix create mode 100644 pkgs/development/interpreters/perl/sys-perl/setup-hook.sh delete mode 100644 pkgs/development/interpreters/sys-perl/builder.sh delete mode 100644 pkgs/development/interpreters/sys-perl/default.nix (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/perl/sys-perl/default.nix b/pkgs/development/interpreters/perl/sys-perl/default.nix new file mode 100644 index 000000000000..d9bf5a6d60a7 --- /dev/null +++ b/pkgs/development/interpreters/perl/sys-perl/default.nix @@ -0,0 +1,15 @@ +{ stdenv }: + +stdenv.mkDerivation { + name = "perl"; + + unpackPhase = "true"; + + installPhase = + '' + mkdir -p $out/bin + ln -s /usr/bin/perl $out/bin + ''; + + setupHook = ./setup-hook.sh; +} diff --git a/pkgs/development/interpreters/perl/sys-perl/setup-hook.sh b/pkgs/development/interpreters/perl/sys-perl/setup-hook.sh new file mode 100644 index 000000000000..1df5cee0f86f --- /dev/null +++ b/pkgs/development/interpreters/perl/sys-perl/setup-hook.sh @@ -0,0 +1,5 @@ +addPerlLibPath () { + addToSearchPath PERL5LIB $1/lib/perl5/site_perl/5.10/i686-cygwin +} + +envHooks=(${envHooks[@]} addPerlLibPath) diff --git a/pkgs/development/interpreters/sys-perl/builder.sh b/pkgs/development/interpreters/sys-perl/builder.sh deleted file mode 100644 index 6b3560cb289d..000000000000 --- a/pkgs/development/interpreters/sys-perl/builder.sh +++ /dev/null @@ -1,4 +0,0 @@ -source $stdenv/setup -mkdir $out -mkdir $out/bin -ln -s /usr/bin/perl $out/bin diff --git a/pkgs/development/interpreters/sys-perl/default.nix b/pkgs/development/interpreters/sys-perl/default.nix deleted file mode 100644 index 346d9d08a898..000000000000 --- a/pkgs/development/interpreters/sys-perl/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{stdenv}: - -stdenv.mkDerivation { - name = "perl"; - builder = ./builder.sh; -} -- cgit 1.4.1