public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

flashplayer: fix 32-bit version

Browse Source
This commit is contained in:
Nikolay Amiantov 2015-12-17 15:08:03 +03:00
parent 7e6cfa2bfd
commit 8c1770769f
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
View File

@ -44,6 +44,16 @@ let
if debug then "32bit_debug" if debug then "32bit_debug"
else "32bit" else "32bit"
else throw "Flash Player is not supported on this platform"; 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 in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "flashplayer-${version}"; name = "flashplayer-${version}";
@ -58,7 +68,7 @@ stdenv.mkDerivation rec {
postUnpack = '' postUnpack = ''
cd */*${arch} cd */*${arch}
tar -xvzf flash-plugin*.tar.gz tar -xvzf *${suffix}.tar.gz
''; '';
sourceRoot = "."; sourceRoot = ".";
@ -87,5 +97,6 @@ stdenv.mkDerivation rec {
homepage = http://www.adobe.com/products/flashplayer/; homepage = http://www.adobe.com/products/flashplayer/;
license = stdenv.lib.licenses.unfree; license = stdenv.lib.licenses.unfree;
maintainers = []; maintainers = [];
platforms = [ "x86_64-linux" "i686-linux" ];
}; };
} }