git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #95623 from lopsided98/perl-cross-shebang

buildPerlPackage: fix patchShebangs when cross-compiling

commit6cbd6955fce2e9252d50ca6f994209a042dc6008 authorJohn Ericson <git@JohnEricson.me> dateMon 24 Aug 2020, 11:45 (6 years ago) parent34f77c0d7e3e03
3 files changed+10−10
pkgs/development/interpreters/perl/default.nix+8−8 pkgs/development/interpreters/perl/setup-hook-cross.sh+1−1 pkgs/development/perl-modules/generic/default.nix+1−1
pkgs/development/interpreters/perl/default.nix+8−8
@@ -28,7 +28,7 @@ let
2828
2929 # TODO: Add a "dev" output containing the header files.
3030 outputs = [ "out" "man" "devdoc" ] ++
31− optional crossCompiling "dev";
31+ optional crossCompiling "mini";
3232 setOutputFlags = false;
3333
3434 disallowedReferences = [ stdenv.cc ];
@@ -144,13 +144,13 @@ let
144144 --replace "$man" /no-such-path
145145 '' + optionalString crossCompiling
146146 ''
147− mkdir -p $dev/lib/perl5/cross_perl/${version}
147+ mkdir -p $mini/lib/perl5/cross_perl/${version}
148148 for dir in cnf/{stub,cpan}; do
149− cp -r $dir/* $dev/lib/perl5/cross_perl/${version}
149+ cp -r $dir/* $mini/lib/perl5/cross_perl/${version}
150150 done
151151
152− mkdir -p $dev/bin
153− install -m755 miniperl $dev/bin/perl
152+ mkdir -p $mini/bin
153+ install -m755 miniperl $mini/bin/perl
154154
155155 export runtimeArch="$(ls $out/lib/perl5/site_perl/${version})"
156156 # wrapProgram should use a runtime-native SHELL by default, but
@@ -161,9 +161,9 @@ let
161161 # miniperl can't load the native modules there. However, it can
162162 # (and sometimes needs to) load and run some of the pure perl
163163 # code there, so we add it anyway. When needed, stubs can be put
164− # into $dev/lib/perl5/cross_perl/${version}.
165− wrapProgram $dev/bin/perl --prefix PERL5LIB : \
166− "$dev/lib/perl5/cross_perl/${version}:$out/lib/perl5/${version}:$out/lib/perl5/${version}/$runtimeArch"
164+ # into $mini/lib/perl5/cross_perl/${version}.
165+ wrapProgram $mini/bin/perl --prefix PERL5LIB : \
166+ "$mini/lib/perl5/cross_perl/${version}:$out/lib/perl5/${version}:$out/lib/perl5/${version}/$runtimeArch"
167167 ''; # */
168168
169169 meta = {
pkgs/development/interpreters/perl/setup-hook-cross.sh+1−1
@@ -9,4 +9,4 @@ addPerlLibPath () {
99 addToSearchPath PERL5LIB $1/lib/perl5/site_perl/@version@/@runtimeArch@
1010}
1111
12−addEnvHooks "$targetOffset" addPerlLibPath
12+addEnvHooks "$hostOffset" addPerlLibPath
pkgs/development/perl-modules/generic/default.nix+1−1
@@ -42,7 +42,7 @@ toPerlModule(stdenv.mkDerivation (
4242 version = lib.getVersion attrs; # TODO: phase-out `attrs.name`
4343 builder = ./builder.sh;
4444 buildInputs = buildInputs ++ [ perl ];
45− nativeBuildInputs = nativeBuildInputs ++ [ (perl.dev or perl) ];
45+ nativeBuildInputs = nativeBuildInputs ++ [ (perl.mini or perl) ];
4646 fullperl = buildPerl;
4747 }
4848))