From 794c91b49eba8e164a219ba85b19ef899502ba5b Mon Sep 17 00:00:00 2001 From: Okina Matara Date: Fri, 22 Jun 2018 18:09:19 -0500 Subject: [PATCH] dolphinEmuMaster: 20180618 -> 2018-06-22 --- pkgs/misc/emulators/dolphin-emu/master.nix | 24 ++++++++++++---------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index ad184c3c8825..3bfbc2565f35 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -10,8 +10,8 @@ # options , dolphin-wxgui ? true -, dolphin-qtgui ? false -}: +, dolphin-qtgui ? false }: + # XOR: ensure only wx XOR qt are enabled assert dolphin-wxgui || dolphin-qtgui; assert !(dolphin-wxgui && dolphin-qtgui); @@ -29,12 +29,14 @@ let startupNotify = "false"; }; in stdenv.mkDerivation rec { - name = "dolphin-emu-20180618"; + name = "dolphin-emu-${version}"; + version = "2018-06-22"; + src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "091efcc41d59dbe0e478ea96f891c1b47b99ddde"; - sha256 = "1djsd41kdaphyyd3jyk669hjl39mskm186v86nijwg4a0c70kb2r"; + rev = "971972069cc2813ee7fa5b630c67baab2b35d12d"; + sha256 = "0kf6dzvwmvhqb1iy15ldap0mmfbyyzl5f14jc65a110vwv5sww7n"; }; enableParallelBuilding = true; @@ -77,13 +79,13 @@ in stdenv.mkDerivation rec { postInstall = '' cp -r ${desktopItem}/share/applications $out/share '' + stdenv.lib.optionalString stdenv.isLinux '' - wrapProgram $out/bin/dolphin-emu-nogui --prefix LD_LIBRARY_PATH : \ - ${vulkan-loader}/lib - wrapProgram $out/bin/dolphin-emu-wx --prefix LD_LIBRARY_PATH : \ - ${vulkan-loader}/lib + wrapProgram $out/bin/dolphin-emu-nogui \ + --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib + wrapProgram $out/bin/dolphin-emu-wx \ + --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib '' + stdenv.lib.optionalString (dolphin-qtgui && stdenv.isLinux) '' - wrapProgram $out/bin/dolphin-emu --prefix LD_LIBRARY_PATH : \ - ${vulkan-loader}/lib + wrapProgram $out/bin/dolphin-emu \ + --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib ln -sf $out/bin/dolphin-emu $out/bin/dolphin-emu-qt '';