Merge pull request #14535 from taku0/flashplayer_11.2.202.616
flashplayer: 11.2.202.577 -> 11.2.202.616
This commit is contained in:
commit
ab9b693321
|
@ -49,7 +49,7 @@ let
|
||||||
suffix =
|
suffix =
|
||||||
if stdenv.system == "x86_64-linux" then
|
if stdenv.system == "x86_64-linux" then
|
||||||
if debug then throw "no x86_64 debugging version available"
|
if debug then throw "no x86_64 debugging version available"
|
||||||
else "-release.x86_64"
|
else "_linux.x86_64"
|
||||||
else if stdenv.system == "i686-linux" then
|
else if stdenv.system == "i686-linux" then
|
||||||
if debug then "_linux_debug.i386"
|
if debug then "_linux_debug.i386"
|
||||||
else "_linux.i386"
|
else "_linux.i386"
|
||||||
|
@ -59,28 +59,30 @@ let
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "flashplayer-${version}";
|
name = "flashplayer-${version}";
|
||||||
version = "11.2.202.577";
|
version = "11.2.202.616";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://fpdownload.macromedia.com/pub/flashplayer/installers/archive/fp_${version}_archive.zip";
|
url = "https://fpdownload.macromedia.com/pub/flashplayer/installers/archive/fp_${version}_archive.zip";
|
||||||
sha256 = "1k02d6c9y8z9lxyqyq04zsc5735cvm30mkwli71mh87fr1va2q4j";
|
sha256 = "0y4bjkla6ils4crmx61pi31s4gscy8rgiv7xccx1z0g6hba9j73l";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ unzip ];
|
buildInputs = [ unzip ];
|
||||||
|
|
||||||
postUnpack = ''
|
postUnpack = ''
|
||||||
pushd $sourceRoot
|
pushd $sourceRoot
|
||||||
tar -xvzf *${arch}/*${suffix}.tar.gz
|
tar -xvzf *${suffix}.tar.gz
|
||||||
|
|
||||||
${ lib.optionalString is-i686 ''
|
${ lib.optionalString is-i686 ''
|
||||||
tar -xvzf */*_sa.*.tar.gz
|
tar -xvzf *_sa.*.tar.gz
|
||||||
tar -xvzf */*_sa_debug.*.tar.gz
|
tar -xvzf *_sa_debug.*.tar.gz
|
||||||
''}
|
''}
|
||||||
|
|
||||||
popd
|
popd
|
||||||
'';
|
'';
|
||||||
|
|
||||||
sourceRoot = "fp_${version}_archive";
|
setSourceRoot = ''
|
||||||
|
sourceRoot=$(ls -d *${arch})
|
||||||
|
'';
|
||||||
|
|
||||||
dontStrip = true;
|
dontStrip = true;
|
||||||
dontPatchELF = true;
|
dontPatchELF = true;
|
||||||
|
|
Loading…
Reference in a new issue