Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

flashplayer: 11.2.202.577 -> 11.2.202.616

(cherry picked from commit 03e74fb117a7651e2ea835f0251b9ce05952b184)

authored by taku0 and committed by Bjørn Forsman e1499bb3 6ca38564

Changed files
+9 -7
pkgs
applications
networking
browsers
mozilla-plugins
flashplayer-11
+9 -7
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
··· 49 49 suffix = 50 50 if stdenv.system == "x86_64-linux" then 51 51 if debug then throw "no x86_64 debugging version available" 52 - else "-release.x86_64" 52 + else "_linux.x86_64" 53 53 else if stdenv.system == "i686-linux" then 54 54 if debug then "_linux_debug.i386" 55 55 else "_linux.i386" ··· 59 59 in 60 60 stdenv.mkDerivation rec { 61 61 name = "flashplayer-${version}"; 62 - version = "11.2.202.577"; 62 + version = "11.2.202.616"; 63 63 64 64 src = fetchurl { 65 65 url = "https://fpdownload.macromedia.com/pub/flashplayer/installers/archive/fp_${version}_archive.zip"; 66 - sha256 = "1k02d6c9y8z9lxyqyq04zsc5735cvm30mkwli71mh87fr1va2q4j"; 66 + sha256 = "0y4bjkla6ils4crmx61pi31s4gscy8rgiv7xccx1z0g6hba9j73l"; 67 67 }; 68 68 69 69 buildInputs = [ unzip ]; 70 70 71 71 postUnpack = '' 72 72 pushd $sourceRoot 73 - tar -xvzf *${arch}/*${suffix}.tar.gz 73 + tar -xvzf *${suffix}.tar.gz 74 74 75 75 ${ lib.optionalString is-i686 '' 76 - tar -xvzf */*_sa.*.tar.gz 77 - tar -xvzf */*_sa_debug.*.tar.gz 76 + tar -xvzf *_sa.*.tar.gz 77 + tar -xvzf *_sa_debug.*.tar.gz 78 78 ''} 79 79 80 80 popd 81 81 ''; 82 82 83 - sourceRoot = "fp_${version}_archive"; 83 + setSourceRoot = '' 84 + sourceRoot=$(ls -d *${arch}) 85 + ''; 84 86 85 87 dontStrip = true; 86 88 dontPatchELF = true;