JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dolphinEmuMaster: 20180618 -> 2018-06-22

Browse Source
This commit is contained in:
Okina Matara 2018-06-22 18:09:19 -05:00 committed by Cray Elliott
parent 25d4708c95
commit 794c91b49e
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/misc/emulators/dolphin-emu/master.nix
View File

@ -10,8 +10,8 @@
# options # options
, dolphin-wxgui ? true , dolphin-wxgui ? true
, dolphin-qtgui ? false , dolphin-qtgui ? false }:
}:
# XOR: ensure only wx XOR qt are enabled # XOR: ensure only wx XOR qt are enabled
assert dolphin-wxgui || dolphin-qtgui; assert dolphin-wxgui || dolphin-qtgui;
assert !(dolphin-wxgui && dolphin-qtgui); assert !(dolphin-wxgui && dolphin-qtgui);
@ -29,12 +29,14 @@ let
startupNotify = "false"; startupNotify = "false";
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "dolphin-emu-20180618"; name = "dolphin-emu-${version}";
version = "2018-06-22";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dolphin-emu"; owner = "dolphin-emu";
repo = "dolphin"; repo = "dolphin";
rev = "091efcc41d59dbe0e478ea96f891c1b47b99ddde"; rev = "971972069cc2813ee7fa5b630c67baab2b35d12d";
sha256 = "1djsd41kdaphyyd3jyk669hjl39mskm186v86nijwg4a0c70kb2r"; sha256 = "0kf6dzvwmvhqb1iy15ldap0mmfbyyzl5f14jc65a110vwv5sww7n";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
@ -77,13 +79,13 @@ in stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
cp -r ${desktopItem}/share/applications $out/share cp -r ${desktopItem}/share/applications $out/share
'' + stdenv.lib.optionalString stdenv.isLinux '' '' + stdenv.lib.optionalString stdenv.isLinux ''
wrapProgram $out/bin/dolphin-emu-nogui --prefix LD_LIBRARY_PATH : \ wrapProgram $out/bin/dolphin-emu-nogui \
${vulkan-loader}/lib --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib
wrapProgram $out/bin/dolphin-emu-wx --prefix LD_LIBRARY_PATH : \ wrapProgram $out/bin/dolphin-emu-wx \
${vulkan-loader}/lib --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib
'' + stdenv.lib.optionalString (dolphin-qtgui && stdenv.isLinux) '' '' + stdenv.lib.optionalString (dolphin-qtgui && stdenv.isLinux) ''
wrapProgram $out/bin/dolphin-emu --prefix LD_LIBRARY_PATH : \ wrapProgram $out/bin/dolphin-emu \
${vulkan-loader}/lib --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib
ln -sf $out/bin/dolphin-emu $out/bin/dolphin-emu-qt ln -sf $out/bin/dolphin-emu $out/bin/dolphin-emu-qt
''; '';