diff options
author | Nikolay Amiantov <ab@fmap.me> | 2016-01-26 00:49:02 +0300 |
---|---|---|
committer | Nikolay Amiantov <ab@fmap.me> | 2016-01-26 00:49:02 +0300 |
commit | 5bc8f09b65893eb190de0896d27fa07f1c897f0d (patch) | |
tree | b8de9d67c5a9da451d971193e41d7fd9878506b7 /pkgs/applications/networking/browsers | |
parent | 5009b4a8cf7fd3e5468d2bd634c04103c49fe703 (diff) | |
parent | d9066cd36fec3116a01ed06df97ee5f365698fb9 (diff) | |
download | nixlib-5bc8f09b65893eb190de0896d27fa07f1c897f0d.tar nixlib-5bc8f09b65893eb190de0896d27fa07f1c897f0d.tar.gz nixlib-5bc8f09b65893eb190de0896d27fa07f1c897f0d.tar.bz2 nixlib-5bc8f09b65893eb190de0896d27fa07f1c897f0d.tar.lz nixlib-5bc8f09b65893eb190de0896d27fa07f1c897f0d.tar.xz nixlib-5bc8f09b65893eb190de0896d27fa07f1c897f0d.tar.zst nixlib-5bc8f09b65893eb190de0896d27fa07f1c897f0d.zip |
Merge pull request #12577 from zohl/flashplayer
Standalone flashplayers
Diffstat (limited to 'pkgs/applications/networking/browsers')
-rw-r--r-- | pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix | 36 |
1 files changed, 33 insertions, 3 deletions
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index 9521e1debd7c..f29f569cd3a0 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -1,4 +1,5 @@ { stdenv +, lib , fetchurl , zlib , alsaLib @@ -54,6 +55,7 @@ let else "_linux.i386" else throw "Flash Player is not supported on this platform"; + is-i686 = (stdenv.system == "i686-linux"); in stdenv.mkDerivation rec { name = "flashplayer-${version}"; @@ -67,19 +69,47 @@ stdenv.mkDerivation rec { buildInputs = [ unzip ]; postUnpack = '' - cd */*${arch} - tar -xvzf *${suffix}.tar.gz + pushd $sourceRoot + tar -xvzf *${arch}/*${suffix}.tar.gz + + ${ lib.optionalString is-i686 '' + tar -xvzf */*_sa.*.tar.gz + tar -xvzf */*_sa_debug.*.tar.gz + ''} + + popd ''; - sourceRoot = "."; + sourceRoot = "fp_${version}_archive"; dontStrip = true; dontPatchELF = true; + outputs = [ "out" ] ++ lib.optionals is-i686 ["sa" "saDbg" ]; + installPhase = '' mkdir -p $out/lib/mozilla/plugins cp -pv libflashplayer.so $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/ + + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-rpath "$rpath" \ + $sa/bin/flashplayer + + + mkdir -p $saDbg/bin + cp flashplayerdebugger $saDbg/bin/ + + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-rpath "$rpath" \ + $saDbg/bin/flashplayerdebugger + ''} ''; passthru = { |