diff options
author | Nikolay Amiantov <ab@fmap.me> | 2015-12-17 15:08:03 +0300 |
---|---|---|
committer | Nikolay Amiantov <ab@fmap.me> | 2015-12-17 15:09:24 +0300 |
commit | 8c1770769fb2f68b881c3d1abbe9b43dde114510 (patch) | |
tree | 2aac16c733a10673a84995253e32ab7ca50175ad | |
parent | 7e6cfa2bfd9f9430858a7594a6e174d997cbfdd8 (diff) |
flashplayer: fix 32-bit version
-rw-r--r-- | pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix | 13 |
1 files changed, 12 insertions, 1 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 34a06967ed8fa..d60ae8ea1dbce 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -44,6 +44,16 @@ let if debug then "32bit_debug" else "32bit" else throw "Flash Player is not supported on this platform"; + + suffix = + if stdenv.system == "x86_64-linux" then + if debug then throw "no x86_64 debugging version available" + else "-release.x86_64" + else if stdenv.system == "i686-linux" then + if debug then "_linux_debug.i386" + else "_linux.i386" + else throw "Flash Player is not supported on this platform"; + in stdenv.mkDerivation rec { name = "flashplayer-${version}"; @@ -58,7 +68,7 @@ stdenv.mkDerivation rec { postUnpack = '' cd */*${arch} - tar -xvzf flash-plugin*.tar.gz + tar -xvzf *${suffix}.tar.gz ''; sourceRoot = "."; @@ -87,5 +97,6 @@ stdenv.mkDerivation rec { homepage = http://www.adobe.com/products/flashplayer/; license = stdenv.lib.licenses.unfree; maintainers = []; + platforms = [ "x86_64-linux" "i686-linux" ]; }; } |