about summary refs log tree commit diff
path: root/pkgs/misc/emulators
diff options
context:
space:
mode:
authorash lea <ashlea@protonmail.com>2019-04-15 18:11:15 -0400
committerCray Elliott <MP2E@archlinux.us>2019-04-17 17:35:40 -0700
commit1e8606946fd92a4d163e779d55e9d4cbd93173c8 (patch)
tree82775e2d45d7d875966d42bde575a716f04a760e /pkgs/misc/emulators
parenteb095fa677e6a2760a9f7f9c32f8d47b08146045 (diff)
downloadnixlib-1e8606946fd92a4d163e779d55e9d4cbd93173c8.tar
nixlib-1e8606946fd92a4d163e779d55e9d4cbd93173c8.tar.gz
nixlib-1e8606946fd92a4d163e779d55e9d4cbd93173c8.tar.bz2
nixlib-1e8606946fd92a4d163e779d55e9d4cbd93173c8.tar.lz
nixlib-1e8606946fd92a4d163e779d55e9d4cbd93173c8.tar.xz
nixlib-1e8606946fd92a4d163e779d55e9d4cbd93173c8.tar.zst
nixlib-1e8606946fd92a4d163e779d55e9d4cbd93173c8.zip
dolphinEmuMaster: 2019-02-16 -> 5.0-9976
changed versioning scheme to match dolphin's own. this also allows us to
include the describe string without deriving it from the git repository
during build.
Diffstat (limited to 'pkgs/misc/emulators')
-rw-r--r--pkgs/misc/emulators/dolphin-emu/master.nix9
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix
index e57c3854926f..d44560b4ddf4 100644
--- a/pkgs/misc/emulators/dolphin-emu/master.nix
+++ b/pkgs/misc/emulators/dolphin-emu/master.nix
@@ -20,13 +20,13 @@ let
   };
 in stdenv.mkDerivation rec {
   name = "dolphin-emu-${version}";
-  version = "2019-02-16";
+  version = "5.0-9976";
 
   src = fetchFromGitHub {
     owner = "dolphin-emu";
     repo = "dolphin";
-    rev = "286aafd4ed2949f0b93230fee969c6a32fe75f07";
-    sha256 = "0l0cpq8s7wnng7mhbnzf4v84zggqsqdykrzfyz5avvbv9pla7jwp";
+    rev = "63f30cc44da248b0226e1c8724b3e53ecf4c768f";
+    sha256 = "0lkf571kzmw26fybl1lqpvhc81jkbh4hcvi3766bb7mvvzapkybd";
   };
 
   enableParallelBuilding = true;
@@ -47,6 +47,9 @@ in stdenv.mkDerivation rec {
   cmakeFlags = [
     "-DUSE_SHARED_ENET=ON"
     "-DENABLE_LTO=ON"
+    "-DDOLPHIN_WC_REVISION=${src.rev}"
+    "-DDOLPHIN_WC_DESCRIBE=${version}"
+    "-DDOLPHIN_WC_BRANCH=master"
   ] ++ stdenv.lib.optionals stdenv.isDarwin [
     "-DOSX_USE_DEFAULT_SEARCH_PATH=True"
   ];