swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-22 21:30:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #43412 from taku0/fix_flashplayer_30.0.0.134

Browse source 
flashplayer: fix hashes
This commit is contained in:
xeji 2018-07-14 00:56:42 +02:00 committed by GitHub
parent b12597d128 900617bd30
commit 1e4cd7a810
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/networking/browsers/firefox-bin/default.nix
View file

@ -19,9 +19,11 @@
, libXScrnSaver , libXScrnSaver
, libxcb , libxcb
, libXcomposite , libXcomposite
, libXcursor
, libXdamage , libXdamage
, libXext , libXext
, libXfixes , libXfixes
, libXi
, libXinerama , libXinerama
, libXrender , libXrender
, libXt , libXt
@ -104,10 +106,12 @@ stdenv.mkDerivation {
libX11 libX11
libXScrnSaver libXScrnSaver
libXcomposite libXcomposite
libXcursor
libxcb libxcb
libXdamage libXdamage
libXext libXext
libXfixes libXfixes
libXi
libXinerama libXinerama
libXrender libXrender
libXt libXt

2
pkgs/applications/networking/browsers/firefox/common.nix
View file

@ -76,7 +76,7 @@ stdenv.mkDerivation (rec {
buildInputs = [ buildInputs = [
gtk2 perl zip libIDL libjpeg zlib bzip2 gtk2 perl zip libIDL libjpeg zlib bzip2
dbus dbus-glib pango freetype fontconfig xorg.libXi dbus dbus-glib pango freetype fontconfig xorg.libXi xorg.libXcursor
xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file
nspr libnotify xorg.pixman yasm libGLU_combined nspr libnotify xorg.pixman yasm libGLU_combined
xorg.libXScrnSaver xorg.scrnsaverproto xorg.libXScrnSaver xorg.scrnsaverproto

6
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
View file

@ -84,14 +84,14 @@ stdenv.mkDerivation rec {
sha256 = sha256 =
if debug then if debug then
if arch == "x86_64" then if arch == "x86_64" then
"1ld9ldsqd5vgghpidskxqmlz8gwdyf3mi3wmfdiaabdjxgzbg8sk" "1xa2mcbcxpfrqdf37a98nvvsvyp0bm3lsv21ky3ps9cba8a13z80"
else else
"1n96rx95spj4r34amapqr1i1klhv944fpvhdmn7gqjawr2hf36js" "1jgl57ggcszdim51dcr0gsjmrdb2kdvxl0lv5zl83cvxcyz0z4p6"
else else
if arch == "x86_64" then if arch == "x86_64" then
"0331r5af4zrvwc4h7dp5qyy91dfam5z03yjggls3x04i10nz5myw" "0331r5af4zrvwc4h7dp5qyy91dfam5z03yjggls3x04i10nz5myw"
else else
"01ibzqzlscpkfqp33bx7qcpz6gfqp4dq9ny3zasvjhi5xqd78j1k"; "011cf0kycs4ih45l23bp6rr2vm7w7jaj4pjvmqwjax4xrb5pzkic";
}; };
nativeBuildInputs = [ unzip ]; nativeBuildInputs = [ unzip ];

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

@ -65,9 +65,9 @@ stdenv.mkDerivation rec {
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/30/flash_player_sa_linux.x86_64.tar.gz"; "https://fpdownload.macromedia.com/pub/flashplayer/updaters/30/flash_player_sa_linux.x86_64.tar.gz";
sha256 = sha256 =
if debug then if debug then
"0snkhs9w192azgv3nykxmgb47z395yrx7faxshasmc7abvvnfpx1" "1plmhv1799j0habmyxy7zhvilh823djmg4i387s6qifr5iv66pax"
else else
"1wgcsbm9w46sp8347agd5m05x3xrki8vi6pf208ifihljw04hbx3"; "13cb7sca5mw5b1iiimyxbfxwpmdh7aya8rnlhkv3fgk5a1jwrxqr";
}; };
nativeBuildInputs = [ unzip ]; nativeBuildInputs = [ unzip ];