diff options
| author | xeji <36407913+xeji@users.noreply.github.com> | 2018-07-14 00:56:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-14 00:56:42 +0200 |
| commit | 1e4cd7a81014b2dce0f7590e90bbb42ab9e74fc2 (patch) | |
| tree | 401ed979923e111599668d0d7f276a9aba9a7d69 /pkgs/applications/networking | |
| parent | b12597d1287955d1647a424094e879f4e63512e4 (diff) | |
| parent | 900617bd309fb7cbd953735a655b4991bf5270b8 (diff) | |
| download | nixlib-1e4cd7a81014b2dce0f7590e90bbb42ab9e74fc2.tar nixlib-1e4cd7a81014b2dce0f7590e90bbb42ab9e74fc2.tar.gz nixlib-1e4cd7a81014b2dce0f7590e90bbb42ab9e74fc2.tar.bz2 nixlib-1e4cd7a81014b2dce0f7590e90bbb42ab9e74fc2.tar.lz nixlib-1e4cd7a81014b2dce0f7590e90bbb42ab9e74fc2.tar.xz nixlib-1e4cd7a81014b2dce0f7590e90bbb42ab9e74fc2.tar.zst nixlib-1e4cd7a81014b2dce0f7590e90bbb42ab9e74fc2.zip | |
Merge pull request #43412 from taku0/fix_flashplayer_30.0.0.134
flashplayer: fix hashes
Diffstat (limited to 'pkgs/applications/networking')
4 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 6a9cd8b7b472..6a5c9d67470c 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -19,9 +19,11 @@ , libXScrnSaver , libxcb , libXcomposite +, libXcursor , libXdamage , libXext , libXfixes +, libXi , libXinerama , libXrender , libXt @@ -104,10 +106,12 @@ stdenv.mkDerivation { libX11 libXScrnSaver libXcomposite + libXcursor libxcb libXdamage libXext libXfixes + libXi libXinerama libXrender libXt diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 0531ec8d94e9..50eb396d6442 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation (rec { buildInputs = [ 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 nspr libnotify xorg.pixman yasm libGLU_combined xorg.libXScrnSaver xorg.scrnsaverproto diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 78e410cda0fc..2384a9da19cb 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -84,14 +84,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "1ld9ldsqd5vgghpidskxqmlz8gwdyf3mi3wmfdiaabdjxgzbg8sk" + "1xa2mcbcxpfrqdf37a98nvvsvyp0bm3lsv21ky3ps9cba8a13z80" else - "1n96rx95spj4r34amapqr1i1klhv944fpvhdmn7gqjawr2hf36js" + "1jgl57ggcszdim51dcr0gsjmrdb2kdvxl0lv5zl83cvxcyz0z4p6" else if arch == "x86_64" then "0331r5af4zrvwc4h7dp5qyy91dfam5z03yjggls3x04i10nz5myw" else - "01ibzqzlscpkfqp33bx7qcpz6gfqp4dq9ny3zasvjhi5xqd78j1k"; + "011cf0kycs4ih45l23bp6rr2vm7w7jaj4pjvmqwjax4xrb5pzkic"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index 563c8db418d4..dbf0bbbd4d54 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -65,9 +65,9 @@ stdenv.mkDerivation rec { "https://fpdownload.macromedia.com/pub/flashplayer/updaters/30/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "0snkhs9w192azgv3nykxmgb47z395yrx7faxshasmc7abvvnfpx1" + "1plmhv1799j0habmyxy7zhvilh823djmg4i387s6qifr5iv66pax" else - "1wgcsbm9w46sp8347agd5m05x3xrki8vi6pf208ifihljw04hbx3"; + "13cb7sca5mw5b1iiimyxbfxwpmdh7aya8rnlhkv3fgk5a1jwrxqr"; }; nativeBuildInputs = [ unzip ]; |