flashplayer: fix build on 32-bit platform

taku0 28232c37 36b5fd8d

Changed files
+18 -16
pkgs
applications
networking
browsers
mozilla-plugins
flashplayer-11
+18 -16
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
···
tar -xvzf *${suffix}.tar.gz
${ lib.optionalString is-i686 ''
-
tar -xvzf *_sa.*.tar.gz
-
tar -xvzf *_sa_debug.*.tar.gz
+
tar -xvzf *_sa[_.]*.tar.gz
''}
popd
···
dontStrip = true;
dontPatchELF = true;
-
outputs = [ "out" ] ++ lib.optionals is-i686 ["sa" "saDbg" ];
+
outputs = [ "out" ] ++ lib.optional (is-i686 && !debug) "sa" ++ lib.optional (is-i686 && debug) "saDbg";
installPhase = ''
mkdir -p $out/lib/mozilla/plugins
···
patchelf --set-rpath "$rpath" $out/lib/mozilla/plugins/libflashplayer.so
${ lib.optionalString is-i686 ''
-
mkdir -p $sa/bin
-
cp flashplayer $sa/bin/
+
${ lib.optionalString (!debug) ''
+
mkdir -p $sa/bin
+
cp flashplayer $sa/bin/
-
patchelf \
-
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-
--set-rpath "$rpath" \
-
$sa/bin/flashplayer
-
+
patchelf \
+
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+
--set-rpath "$rpath" \
+
$sa/bin/flashplayer
+
''}
-
mkdir -p $saDbg/bin
-
cp flashplayerdebugger $saDbg/bin/
+
${ lib.optionalString debug ''
+
mkdir -p $saDbg/bin
+
cp flashplayerdebugger $saDbg/bin/
-
patchelf \
-
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-
--set-rpath "$rpath" \
-
$saDbg/bin/flashplayerdebugger
+
patchelf \
+
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+
--set-rpath "$rpath" \
+
$saDbg/bin/flashplayerdebugger
+
''}
''}
'';