mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 23:13:19 +00:00
* lib/site_perl -> lib/perl5/site_perl.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15258
This commit is contained in:
parent
9609437573
commit
7ec61219db
@ -47,9 +47,9 @@ stdenv.mkDerivation rec {
|
||||
+ (if svnSupport then
|
||||
|
||||
''# wrap git-svn
|
||||
gitperllib=$out/lib/site_perl
|
||||
gitperllib=$out/lib/perl5/site_perl
|
||||
for i in ${builtins.toString perlLibs}; do
|
||||
gitperllib=$gitperllib:$i/lib/site_perl
|
||||
gitperllib=$gitperllib:$i/lib/perl5/site_perl
|
||||
done
|
||||
wrapProgram "$out/libexec/git-core/git-svn" \
|
||||
--set GITPERLLIB "$gitperllib" \
|
||||
|
@ -54,9 +54,9 @@ stdenv.mkDerivation rec {
|
||||
+ (if svnSupport then
|
||||
|
||||
''# wrap git-svn
|
||||
gitperllib=$out/lib/site_perl
|
||||
gitperllib=$out/lib/perl5/site_perl
|
||||
for i in ${builtins.toString perlLibs}; do
|
||||
gitperllib=$gitperllib:$i/lib/site_perl
|
||||
gitperllib=$gitperllib:$i/lib/perl5/site_perl
|
||||
done
|
||||
#cp git-svn "$out/bin"
|
||||
wrapArgs="$wrapArgs --set GITPERLLIB $gitperllib"
|
||||
|
@ -1,6 +1,6 @@
|
||||
source $stdenv/setup
|
||||
|
||||
PERL5LIB="$PERL5LIB${PERL5LIB:+:}$out/lib/site_perl"
|
||||
PERL5LIB="$PERL5LIB${PERL5LIB:+:}$out/lib/perl5/site_perl"
|
||||
|
||||
perlFlags=
|
||||
for i in $(IFS=:; echo $PERL5LIB); do
|
||||
|
@ -2,15 +2,18 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "icon-naming-utils-0.8.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://tango.freedesktop.org/releases/icon-naming-utils-0.8.7.tar.gz;
|
||||
sha256 = "1lj0lffdg7fjfinhrn0vsq1kj010dxlxlix4jfc969j6l3k9rd0w";
|
||||
};
|
||||
|
||||
buildInputs = [perl perlXMLSimple];
|
||||
|
||||
postInstall = "
|
||||
# Add XML::Simple to the runtime search path.
|
||||
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
|
||||
ln -s $out/share/pkgconfig $out/lib/pkgconfig # WTF?
|
||||
";
|
||||
|
@ -11,10 +11,11 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ perl ];
|
||||
|
||||
# First install the `File::MMagic' Perl module.
|
||||
# !!! this shouldn't refer to Perl 5.10.0!
|
||||
preConfigure = ''
|
||||
( cd File-MMagic && \
|
||||
perl Makefile.PL \
|
||||
LIB="$out/lib/site_perl/5.10.0" \
|
||||
LIB="$out/lib/perl5/site_perl/5.10.0" \
|
||||
INSTALLSITEMAN3DIR="$out/man" && \
|
||||
make && make install )
|
||||
export PERL5LIB="$out/lib/site_perl/5.10.0:$PERL5LIB"
|
||||
|
@ -32,9 +32,9 @@ stdenv.mkDerivation rec {
|
||||
# XXX: We work around the fact that `wrapProgram' doesn't support
|
||||
# spaces below by inserting escaped backslashes.
|
||||
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 : \
|
||||
"${perlXMLNamespaceSupport}/lib/site_perl" \
|
||||
"${perlXMLNamespaceSupport}/lib/perl5/site_perl" \
|
||||
--prefix XML_CATALOG_FILES "\ " \
|
||||
"$out/share/docbook2X/dtd/catalog.xml\ $out/share/docbook2X/xslt/catalog.xml"
|
||||
done
|
||||
|
Loading…
Reference in New Issue
Block a user