From 4de36e3b506b899fb642599323ff3be3d786d275 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 22 Aug 2003 15:09:51 +0000 Subject: [PATCH] * OpenSSL, Firebird require Perl. svn path=/nixpkgs/trunk/; revision=345 --- pkgs/firebird/firebird-build.sh | 2 +- pkgs/firebird/firebird.fix | 1 + pkgs/openssl/openssl-build.sh | 1 + pkgs/openssl/openssl.fix | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/firebird/firebird-build.sh b/pkgs/firebird/firebird-build.sh index 90f85c68b9c..9bd066507fb 100755 --- a/pkgs/firebird/firebird-build.sh +++ b/pkgs/firebird/firebird-build.sh @@ -2,7 +2,7 @@ envpkgs="$gtk $libIDL" . $stdenv/setup || exit 1 -export PATH=$pkgconfig/bin:$PATH +export PATH=$pkgconfig/bin:$perl/bin:$PATH tar xvfj $src || exit 1 cd mozilla || exit 1 diff --git a/pkgs/firebird/firebird.fix b/pkgs/firebird/firebird.fix index 5965447db86..1447f3fc37f 100644 --- a/pkgs/firebird/firebird.fix +++ b/pkgs/firebird/firebird.fix @@ -11,6 +11,7 @@ Package( , ("stdenv", IncludeFix("stdenv/stdenv.fix")) , ("pkgconfig", IncludeFix("pkgconfig/pkgconfig.fix")) , ("gtk", IncludeFix("gtk+/gtk+.fix")) + , ("perl", IncludeFix("perl/perl.fix")) , ("libIDL", IncludeFix("libIDL/libIDL.fix")) ] ) diff --git a/pkgs/openssl/openssl-build.sh b/pkgs/openssl/openssl-build.sh index e5c7c2e13ed..2a1f7213e43 100755 --- a/pkgs/openssl/openssl-build.sh +++ b/pkgs/openssl/openssl-build.sh @@ -1,6 +1,7 @@ #! /bin/sh . $stdenv/setup || exit 1 +export PATH=$perl/bin:$PATH tar xvfz $src || exit 1 cd openssl-* || exit 1 diff --git a/pkgs/openssl/openssl.fix b/pkgs/openssl/openssl.fix index 14b9e9f34d8..d154ca6e9b9 100644 --- a/pkgs/openssl/openssl.fix +++ b/pkgs/openssl/openssl.fix @@ -9,5 +9,6 @@ Package( ])) , ("stdenv", IncludeFix("stdenv/stdenv.fix")) + , ("perl", IncludeFix("perl/perl.fix")) ] )