summary refs log tree commit diff
path: root/pkgs/misc
diff options
context:
space:
mode:
authorChristoph Hrdinka <c.github@hrdinka.at>2020-04-22 16:10:01 +0200
committerGitHub <noreply@github.com>2020-04-22 16:10:01 +0200
commit63acac64354d35f094350321f85c33a408c8fc72 (patch)
treea6f9cca7567e287f622afa6a388fca73d304be38 /pkgs/misc
parent81902419ddb83f4d3cbe1750317ce1669e2ca73e (diff)
parent56ab879c3ff92a3358165d32b88576d90e3555c4 (diff)
downloadnixpkgs-63acac64354d35f094350321f85c33a408c8fc72.tar
nixpkgs-63acac64354d35f094350321f85c33a408c8fc72.tar.gz
nixpkgs-63acac64354d35f094350321f85c33a408c8fc72.tar.bz2
nixpkgs-63acac64354d35f094350321f85c33a408c8fc72.tar.lz
nixpkgs-63acac64354d35f094350321f85c33a408c8fc72.tar.xz
nixpkgs-63acac64354d35f094350321f85c33a408c8fc72.tar.zst
nixpkgs-63acac64354d35f094350321f85c33a408c8fc72.zip
Merge pull request #85679 from Omoroca13/pcsx2
pcsx2: unstable-2020-01-05 -> 1.6.0-rc
Diffstat (limited to 'pkgs/misc')
-rw-r--r--pkgs/misc/emulators/pcsx2/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/misc/emulators/pcsx2/default.nix b/pkgs/misc/emulators/pcsx2/default.nix
index 6f28c5777ca..3faba2ee467 100644
--- a/pkgs/misc/emulators/pcsx2/default.nix
+++ b/pkgs/misc/emulators/pcsx2/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pcsx2";
-  version = "unstable-2020-01-05";
+  version = "1.6.0-rc";
 
   src = fetchFromGitHub {
     owner = "PCSX2";
     repo = "pcsx2";
-    rev = "9c12937351c51b921e1f28d44b019bc52e747c51";
-    sha256 = "0y1f5v99a6njmf6hyvl4z5xnrm7351rkyw2fn4f09hqn92r7zmi5";
+    rev = "v${version}";
+    sha256 = "1mdv1dgwawb4k6bs1jh6j2jaaxg168fbssm1lwnlk5di0gz31h23";
   };
 
   postPatch = "sed '1i#include \"x86intrin.h\"' -i common/src/x86emitter/cpudetect.cpp";