Merge pull request #235347 from NickCao/TextBibTeX

perlPackages.TextBibTeX: always install libbtparse.so to /lib instead of /lib64
This commit is contained in:
Nick Cao 2023-06-02 00:33:45 -06:00 committed by GitHub
commit 65732153a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View File

@ -5,7 +5,7 @@
}
else {
- if ( $Config{archname} =~ /^x86_64|^ppc64|^s390x|^aarch64|^riscv64/ ) {
+ if ( $Config{archname} =~ /^x86_64|^ppc64|^s390x|^riscv64/ ) {
+ if ( 0 ) {
$libdir =~ s/\bbin\b/lib64/;
if ( !-d $libdir ) {
my $test = $libdir;

View File

@ -25171,8 +25171,8 @@ with self; {
url = "mirror://cpan/authors/id/A/AM/AMBS/Text-BibTeX-0.88.tar.gz";
hash = "sha256-sBRYbmi9vK+wos+gQB6woE6l3oxNW8Nt0Pf66ras9Cw=";
};
# libbtparse.so: cannot open shared object file (aarch64 only)
patches = [ ../development/perl-modules/TextBibTeX-use-lib-on-aarch64.patch ];
# libbtparse.so: cannot open shared object file
patches = [ ../development/perl-modules/TextBibTeX-use-lib.patch ];
perlPreHook = "export LD=$CC";
perlPostHook = lib.optionalString stdenv.isDarwin ''
oldPath="$(pwd)/btparse/src/libbtparse.dylib"