alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

flashplayer-standalone: 25.0.0.127 -> 25.0.0.148

Browse source
This commit is contained in:
Eelco Dolstra 2017-04-14 11:42:32 +02:00
parent 72605647a4
commit 6a1f168b1e
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
View file

@ -49,15 +49,13 @@
let let
arch = arch =
if stdenv.system == "x86_64-linux" then if stdenv.system == "x86_64-linux" then
"x86_64" "x86_64"
else if stdenv.system == "i686-linux" then
"i386"
else throw "Flash Player is not supported on this platform"; else throw "Flash Player is not supported on this platform";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "flashplayer-standalone-${version}"; name = "flashplayer-standalone-${version}";
version = "25.0.0.127"; version = "25.0.0.148";
src = fetchurl { src = fetchurl {
url = url =
@ -67,9 +65,9 @@ stdenv.mkDerivation rec {
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/25/flash_player_sa_linux.x86_64.tar.gz"; "https://fpdownload.macromedia.com/pub/flashplayer/updaters/25/flash_player_sa_linux.x86_64.tar.gz";
sha256 = sha256 =
if debug then if debug then
"07a8x1n997lmkxj74bkygh60shwzxzcvfxpz07pxj1nmvakmin51" "1pkzpip8d3m92kyzap00xxq40yilgmaqnc47nak3i7gnbic8fa2r"
else else
"0rzxfcvjjwbd1m6pyby8km4g5834zy5d5sih7xq3czds9x0a2jp2"; "0xxsbxnkf9xnljy6sn61jqx9xd1w0lm5mbw4ca7xk5rkc84ik91z";
}; };
nativeBuildInputs = [ unzip ]; nativeBuildInputs = [ unzip ];

6
pkgs/top-level/all-packages.nix
View file

@ -13766,15 +13766,15 @@ with pkgs;
flac = callPackage ../applications/audio/flac { }; flac = callPackage ../applications/audio/flac { };
flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer { flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer {
debug = config.flashplayer.debug or false; debug = config.flashplayer.debug or false;
}; };
flashplayer-standalone = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix { flashplayer-standalone = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix {
debug = config.flashplayer.debug or false; debug = config.flashplayer.debug or false;
}; };
flashplayer-standalone-debugger = flashplayer-standalone.override { flashplayer-standalone-debugger = flashplayer-standalone.override {
debug = true; debug = true;
}; };
fluxbox = callPackage ../applications/window-managers/fluxbox { }; fluxbox = callPackage ../applications/window-managers/fluxbox { };