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

* lib/site_perl -> lib/perl5/site_perl.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=15258
This commit is contained in:
Eelco Dolstra 2009-04-22 23:04:18 +00:00
parent 9609437573
commit 7ec61219db
6 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/version-management/git-and-tools/git/default.nix
View File

@ -47,9 +47,9 @@ stdenv.mkDerivation rec {
+ (if svnSupport then + (if svnSupport then
''# wrap git-svn ''# wrap git-svn
gitperllib=$out/lib/site_perl gitperllib=$out/lib/perl5/site_perl
for i in ${builtins.toString perlLibs}; do for i in ${builtins.toString perlLibs}; do
gitperllib=$gitperllib:$i/lib/site_perl gitperllib=$gitperllib:$i/lib/perl5/site_perl
done done
wrapProgram "$out/libexec/git-core/git-svn" \ wrapProgram "$out/libexec/git-core/git-svn" \
--set GITPERLLIB "$gitperllib" \ --set GITPERLLIB "$gitperllib" \

4
pkgs/applications/version-management/git-and-tools/git/git-git.nix
View File

@ -54,9 +54,9 @@ stdenv.mkDerivation rec {
+ (if svnSupport then + (if svnSupport then
''# wrap git-svn ''# wrap git-svn
gitperllib=$out/lib/site_perl gitperllib=$out/lib/perl5/site_perl
for i in ${builtins.toString perlLibs}; do for i in ${builtins.toString perlLibs}; do
gitperllib=$gitperllib:$i/lib/site_perl gitperllib=$gitperllib:$i/lib/perl5/site_perl
done done
#cp git-svn "$out/bin" #cp git-svn "$out/bin"
wrapArgs="$wrapArgs --set GITPERLLIB $gitperllib" wrapArgs="$wrapArgs --set GITPERLLIB $gitperllib"

2
pkgs/development/perl-modules/generic/builder.sh
View File

@ -1,6 +1,6 @@
source $stdenv/setup source $stdenv/setup
PERL5LIB="$PERL5LIB${PERL5LIB:+:}$out/lib/site_perl" PERL5LIB="$PERL5LIB${PERL5LIB:+:}$out/lib/perl5/site_perl"
perlFlags= perlFlags=
for i in $(IFS=:; echo $PERL5LIB); do for i in $(IFS=:; echo $PERL5LIB); do

5
pkgs/development/tools/misc/icon-naming-utils/default.nix
View File

@ -2,15 +2,18 @@
stdenv.mkDerivation { stdenv.mkDerivation {
name = "icon-naming-utils-0.8.7"; name = "icon-naming-utils-0.8.7";
src = fetchurl { src = fetchurl {
url = http://tango.freedesktop.org/releases/icon-naming-utils-0.8.7.tar.gz; url = http://tango.freedesktop.org/releases/icon-naming-utils-0.8.7.tar.gz;
sha256 = "1lj0lffdg7fjfinhrn0vsq1kj010dxlxlix4jfc969j6l3k9rd0w"; sha256 = "1lj0lffdg7fjfinhrn0vsq1kj010dxlxlix4jfc969j6l3k9rd0w";
}; };
buildInputs = [perl perlXMLSimple]; buildInputs = [perl perlXMLSimple];
postInstall = " postInstall = "
# Add XML::Simple to the runtime search path. # Add XML::Simple to the runtime search path.
substituteInPlace $out/libexec/icon-name-mapping \\ substituteInPlace $out/libexec/icon-name-mapping \\
--replace '/bin/perl' '/bin/perl -I${perlXMLSimple}/lib/site_perl'; --replace '/bin/perl' '/bin/perl -I${perlXMLSimple}/lib/perl5/site_perl';
ensureDir $out/lib ensureDir $out/lib
ln -s $out/share/pkgconfig $out/lib/pkgconfig # WTF? ln -s $out/share/pkgconfig $out/lib/pkgconfig # WTF?
"; ";

3
pkgs/tools/text/namazu/default.nix
View File

@ -11,10 +11,11 @@ stdenv.mkDerivation rec {
buildInputs = [ perl ]; buildInputs = [ perl ];
# First install the `File::MMagic' Perl module. # First install the `File::MMagic' Perl module.
# !!! this shouldn't refer to Perl 5.10.0!
preConfigure = '' preConfigure = ''
( cd File-MMagic && \ ( cd File-MMagic && \
perl Makefile.PL \ perl Makefile.PL \
LIB="$out/lib/site_perl/5.10.0" \ LIB="$out/lib/perl5/site_perl/5.10.0" \
INSTALLSITEMAN3DIR="$out/man" && \ INSTALLSITEMAN3DIR="$out/man" && \
make && make install ) make && make install )
export PERL5LIB="$out/lib/site_perl/5.10.0:$PERL5LIB" export PERL5LIB="$out/lib/site_perl/5.10.0:$PERL5LIB"

4
pkgs/tools/typesetting/docbook2x/default.nix
View File

@ -32,9 +32,9 @@ stdenv.mkDerivation rec {
# XXX: We work around the fact that `wrapProgram' doesn't support # XXX: We work around the fact that `wrapProgram' doesn't support
# spaces below by inserting escaped backslashes. # spaces below by inserting escaped backslashes.
wrapProgram $out/bin/$i --prefix PERL5LIB : \ wrapProgram $out/bin/$i --prefix PERL5LIB : \
"${perlXMLSAX}/lib/site_perl:${perlXMLParser}/lib/site_perl" \ "${perlXMLSAX}/lib/perl5/site_perl:${perlXMLParser}/lib/perl5/site_perl" \
--prefix PERL5LIB : \ --prefix PERL5LIB : \
"${perlXMLNamespaceSupport}/lib/site_perl" \ "${perlXMLNamespaceSupport}/lib/perl5/site_perl" \
--prefix XML_CATALOG_FILES "\ " \ --prefix XML_CATALOG_FILES "\ " \
"$out/share/docbook2X/dtd/catalog.xml\ $out/share/docbook2X/xslt/catalog.xml" "$out/share/docbook2X/dtd/catalog.xml\ $out/share/docbook2X/xslt/catalog.xml"
done done