Merge remote-tracking branch 'upstream/master' into hardened-stdenv

6 files changed, 49 insertions, 23 deletions

diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix
index 0eaf08c2b8d4..9743261c6b2b 100644
--- a/pkgs/misc/emulators/dolphin-emu/master.nix
+++ b/pkgs/misc/emulators/dolphin-emu/master.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   src = fetchgit {
     url = git://github.com/dolphin-emu/dolphin.git;
     rev = "5097a22844b850b429872f4de390bd958b11a616";
-    sha256 = "1qizkahbimpmgjs51av1cdmnnyvbz0j0gknmi5vdc38vrzxvwkrf";
+    sha256 = "09jx61cxvfimnq1snkv6w3m9qidrgp0j0w81c7pbkpmcwysz8xya";
     fetchSubmodules = false;
   };
 
diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix
index 07470fa54ab4..a35b7a846b18 100644
--- a/pkgs/misc/emulators/mgba/default.nix
+++ b/pkgs/misc/emulators/mgba/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   src = fetchgit {
     url = "https://github.com/mgba-emu/mgba.git";
     rev = "be2641c77b4a438e0db487bc82b43bc27a26e0c2";
-    sha256 = "0ygsmmp24w14x5fm2qz2v68p59bs2ravn22axrg2ipn5skkgrvxz";
+    sha256 = "1wxywfbkgqvb0j9cyz4nwsfzhxrdjcmvz1k7rljmy4bz1pjcglj1";
   };
 
   buildInputs = [
diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix
index 87ae977c7cc7..68fb71050780 100644
--- a/pkgs/misc/emulators/ppsspp/default.nix
+++ b/pkgs/misc/emulators/ppsspp/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec{
     url = "https://github.com/hrydgard/ppsspp.git";
     rev = "8c8e5de89d52b8bcb968227d96cbf049d04d1241";
     fetchSubmodules = true;
-    sha256 = "71dfa0be045f31969b1d6ab4f1adf6a208f9ef4834d708bc7bf6d9195efb5f80";
+    sha256 = "1q21qskzni0nvz2yi2m17gjh4i9nrs2l4fm4y2dww9m29xpvzw3x";
   };
 
   buildInputs = [ zlib libpng pkgconfig qt4 qmake4Hook ]
diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix
index 07783d016183..259a6007975c 100644
--- a/pkgs/misc/emulators/retroarch/cores.nix
+++ b/pkgs/misc/emulators/retroarch/cores.nix
@@ -55,7 +55,7 @@ in
     src = fetchRetro {
       repo = core + "-libretro";
       rev = "cbd700e2bb95f08f241ca24330fa732aa6af8018";
-      sha256 = "1118iadkznppygq0mppirx1ycndmjp3fqlj8sshiby47j8sgly6h";
+      sha256 = "1xp43hpd23rhj96pns13fz9mjp66gmxzl5frqa8q9fqcn2qkx7b1";
     };
     description = "Port of 4DO/libfreedo to libretro";
   }).override {
@@ -67,7 +67,7 @@ in
     src = fetchRetro {
       repo = bname;
       rev = "0bfe7f4f895af0927cec1c06dcae096b59416159";
-      sha256 = "0xsf10zkx7pnjpdb9n605663i0vqgnshdfjmb472hg84l9dr4gr5";
+      sha256 = "0dmaa1vy6nfj9jk6xkvrbbcxa9j3f3zrp24zflnqbizc088vncb9";
     };
     description = "Fork of bsnes with HLE DSP emulation restored";
   }).override {
@@ -79,7 +79,7 @@ in
     src = fetchRetro {
       repo = core;
       rev = "cae5945149a72b1dc0b130d6e60e2690b88a925a";
-      sha256 = "1z4gzixkvxn2s5x5pn179ddwwh3blw7phdkp33qxv40kcv6g3h79";
+      sha256 = "1qzlbw0vy87zi3w6hp5zj9dxdkj3qc9czjf41sj70irwyvqi0kii";
     };
     description = "libretro wrapper for desmume NDS emulator";
   }).override {
@@ -91,7 +91,7 @@ in
     src = fetchRetro {
       repo = core + "-libretro";
       rev = "b642e054a1f581fbac16c08f4b8df9ab6c474203";
-      sha256 = "0h2bk8m1hn2z76hachdmalgh2nv51jgfhmiqqhfkghf00rabinlx";
+      sha256 = "0jxbzjhpyw1fzipm2ai2nv62vb0q5cb203m093vakr1zdsx7si2n";
     };
     description = "Port of Final Burn Alpha to libretro";
   }).override {
@@ -117,7 +117,7 @@ in
     src = fetchRetro {
       repo = core + "-libretro";
       rev = "59fb6a652e0de3c3a3b29e58af5ac035958da37e";
-      sha256 = "0vgnn4dnxbw258s3vs1wzgy29cvcywlbfdrzddiwxbp7anclzxkv";
+      sha256 = "0n2416lgqbzah1q3ji1hhpcdi9h29563gz739kf9libmnz86vd6f";
     };
     description = "Gambatte libretro port";
   }).override {
@@ -139,7 +139,7 @@ in
     src = fetchRetro {
       repo = "mame";
       rev = "8da2303292bb8530f9f4ffad8bf1df95ee4cab74";
-      sha256 = "0rzy5klp8vf9vc8fylbdnp2qcvl1nkgw5a55ljqc5vich4as5alq";
+      sha256 = "0afsxsm1d4x9jn28qz6v47hhnp7q9i0yqk62i4lk4d7i7m4dq5j9";
     };
     description = "Port of MAME to libretro";
 
@@ -151,7 +151,7 @@ in
     src = fetchRetro {
       repo = "beetle-pce-fast-libretro";
       rev = "6e2eaf75da2eb3dfcf2fd64413f471c8c90cf885";
-      sha256 = "1mxlvd3bcc6grryby2xn4k2gia3s49ngkwcvgxlj1fg3hkr5kcp8";
+      sha256 = "0m946108wzawg0c4xvqpv6yzfmjngz6lji5hn4swgk0z5f2bj5a5";
     };
     description = "Port of Mednafen's PC Engine core to libretro";
   }).override {
@@ -163,7 +163,7 @@ in
     src = fetchRetro {
       repo = "beetle-psx-libretro";
       rev = "20c9b0eb0062b8768cc40aca0e2b2d626f1002a2";
-      sha256 = "1dhql8zy9wv55m1lgvqv412087cqmlw7zwcsmxkl3r4z199dsh3m";
+      sha256 = "192xzvdbjjqlxrnxxn45hmrr6yjpxw3gapkbax6nhrabnxhva43k";
     };
     description = "Port of Mednafen's PSX Engine core to libretro";
   }).override {
@@ -175,7 +175,7 @@ in
     src = fetchRetro {
       repo = core + "-libretro";
       rev = "7db9296453629a44de806589f3ff64e824e775ad";
-      sha256 = "0gykkx8j0xlkr1dqz5k5hiyki2wsz9ys05df5zv3f2rpk2dkdwyp";
+      sha256 = "075lpmwmj99yf9d9905x7apawd4bqz0whr37mh2fgr3jf730yiyl";
     };
     description = "Libretro port of Mupen64 Plus, GL only";
 
@@ -189,7 +189,7 @@ in
     src = fetchRetro {
       repo = core;
       rev = "dcaed965760669161d6fd44755887545ea393041";
-      sha256 = "09fvk3ki9nw76kb1c4sw6c54wwn9y3ypsxnbzvhzsarmapkd9fa3";
+      sha256 = "03fy5hb181ffx8sk9wmm415k084zqqhfqga4crgc7hdqi16s3r5v";
     };
     description = "nestopia undead libretro port";
   }).override {
@@ -201,7 +201,7 @@ in
     src = fetchRetro {
       repo = core;
       rev = "e912fdf26376bfa5d7d6488055fe6fdbd13c2e49";
-      sha256 = "1jg9ig3vxbmna6cavz39hk6j9dpm4prfmmdpf7lzn1qvpqxs3ynx";
+      sha256 = "1mi36y8kx6s76cgygpj11zw35p44gd66mxygmxliz7k6xsd7ww41";
     };
     description = "Fast MegaDrive/MegaCD/32X emulator";
 
@@ -216,7 +216,7 @@ in
     src = fetchRetro {
       repo = "libretro-" + core;
       rev = "ea17e27fcf16b9f875718b6550fe7145c6257c06";
-      sha256 = "0l6bzh50vh87j0g1s4144qfqa7vy7gry9ifd5vq1y5114fvbqdlb";
+      sha256 = "0w5njj5pamqc4a022hdplb7vapwkf34ad1w4acz3c8b05vkl457d";
     };
     description = "ppsspp libretro port";
     extraBuildInputs = [ mesa ffmpeg ];
@@ -241,7 +241,7 @@ in
     src = fetchRetro {
       repo = "QuickNES_Core";
       rev = "518638b8064c9d0cb1b5aa29d96419f8528c9de5";
-      sha256 = "0n6w8g0gklli9qs9vv17kljj83n9pky32ir25r7b202nl0292h53";
+      sha256 = "0jv1z65m4j3hbfnb3chklh0dhwlc4gdqr0asswdsc1y4iwp0331c";
     };
     description = "QuickNES libretro port";
   }).override {
@@ -253,7 +253,7 @@ in
     src = fetchRetro {
       repo = core;
       rev = "c3e719acc08c1873609bab3578939b7c9e606511";
-      sha256 = "08ab4gybp76la3z94dgg0jjzmajva9003p74256hgr7nnk2kwn4q";
+      sha256 = "03wvffy3h62qc7f3d8042wd234m8ikd843ggp903y285sgh54r9y";
     };
     description = "Libretro port of ScummVM";
     extraBuildInputs = [ fluidsynth libjpeg libvorbis mesa SDL ];
@@ -278,7 +278,7 @@ in
     src = fetchRetro {
       repo = core;
       rev = "dfb7eef46d6bc2dbcc98f25e2bfadc9d2cff5cfd";
-      sha256 = "1naznsy1mhijcijysm9g8r95dxhr8rspixmf6r187rpcrvfd4zbl";
+      sha256 = "0vdfjdwr6b5izh3gy63lcfnrdvr99qhlqfibjw4mmyqk9gkjrwm8";
     };
     description = "Optimized port/rewrite of SNES9x 1.52+ to Libretro";
   };
@@ -288,7 +288,7 @@ in
     src = fetchRetro {
       repo = core + "-libretro";
       rev = "ada5c57d632ace0ba915ce7a470d504a5d89ebcc";
-      sha256 = "1riwi6n9fj5vd5jcldwpwaxxvgxv3gs232l6zm9k26x3rngwcyfz";
+      sha256 = "090isch1l5hm07l22l8hja31cdiaxc0vgc3i01qs8zgdyvsx4vvg";
     };
     description = "Port of Stella to libretro";
   }).override {
@@ -300,7 +300,7 @@ in
     src = fetchRetro {
       repo = core;
       rev = "0c20cd92bc8684340d7a1bcae14a603001ad5e4a";
-      sha256 = "09shkha7i7a226nk9wfxswsj3wwrxn7xwrsaaki1x8pvbyy5wjg9";
+      sha256 = "016vm2xyjfkkcqkqfw3n09if4bxxppk3g6p92waa9bv2ni4xli69";
     };
     description = "VBA-M libretro port with modifications for speed";
   };
diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix
index 87fb854c8448..0ab4698c196e 100644
--- a/pkgs/misc/emulators/retroarch/default.nix
+++ b/pkgs/misc/emulators/retroarch/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   src = fetchgit {
     url = https://github.com/libretro/RetroArch.git;
     rev = "09dda14549fc13231311fd522a07a75e923889aa";
-    sha256 = "1f7w4i0idc4n0sqc5pcrsxsljk3f614sfdqhdgjb1l4xj16g37cg";
+    sha256 = "0yrisl61iaa70ahswzgb505bvm5cxq8ndnv2bw7gqrlm5qrh54qy";
   };
 
   buildInputs = [ pkgconfig ffmpeg mesa nvidia_cg_toolkit freetype libxml2 libv4l coreutils
diff --git a/pkgs/misc/emulators/zsnes/default.nix b/pkgs/misc/emulators/zsnes/default.nix
index 23930ac624ce..be7666487b95 100644
--- a/pkgs/misc/emulators/zsnes/default.nix
+++ b/pkgs/misc/emulators/zsnes/default.nix
@@ -1,6 +1,18 @@
-{stdenv, fetchurl, fetchpatch, nasm, SDL, zlib, libpng, ncurses, mesa}:
+{stdenv, fetchurl, fetchpatch, nasm, SDL, zlib, libpng, ncurses, mesa
+, makeDesktopItem }:
 
-stdenv.mkDerivation {
+let
+  desktopItem = makeDesktopItem {
+    name = "zsnes";
+    exec = "zsnes";
+    icon = "zsnes";
+    comment = "A SNES emulator";
+    desktopName = "zsnes";
+    genericName = "zsnes";
+    categories = "Game;";
+  };
+
+in stdenv.mkDerivation {
   name = "zsnes-1.51";
 
   src = fetchurl {
@@ -39,6 +51,20 @@ stdenv.mkDerivation {
 
   configureFlags = [ "--enable-release" ];
 
+  postInstall = ''
+    function installIcon () {
+        mkdir -p $out/share/icons/hicolor/$1/apps/
+        cp icons/$1x32.png $out/share/icons/hicolor/$1/apps/zsnes.png
+    }
+    installIcon "16x16"
+    installIcon "32x32"
+    installIcon "48x48"
+    installIcon "64x64"
+
+    mkdir -p $out/share/applications
+    ln -s ${desktopItem}/share/applications/* $out/share/applications/
+  '';
+
   meta = {
     description = "A Super Nintendo Entertainment System Emulator";
     license = stdenv.lib.licenses.gpl2Plus;