diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:31:50 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:32:25 +0100 |
| commit | b7baf40e099b4215181fe7b0c63083b12ef2c7fb (patch) | |
| tree | a6efabd31d05b6d0a36624729e80377bbbfb0149 /nixpkgs/pkgs/applications/emulators/dolphin-emu/default.nix | |
| parent | 710028664e26e85cb831a869b3da9f6993902255 (diff) | |
| parent | 0799f514b1cd74878174939df79ac60ca5036673 (diff) | |
| download | nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.gz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.bz2 nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.lz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.xz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.zst nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/applications/emulators/dolphin-emu/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/applications/emulators/dolphin-emu/default.nix | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/applications/emulators/dolphin-emu/default.nix b/nixpkgs/pkgs/applications/emulators/dolphin-emu/default.nix index 664399f75739..52a7f8a1ba6e 100644 --- a/nixpkgs/pkgs/applications/emulators/dolphin-emu/default.nix +++ b/nixpkgs/pkgs/applications/emulators/dolphin-emu/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , pkg-config , wrapQtAppsHook @@ -12,7 +11,7 @@ , curl , enet , ffmpeg -, fmt_8 +, fmt_10 , gtest , hidapi , libevdev @@ -24,6 +23,7 @@ , libXdmcp , libXext , libXrandr +, lz4 , lzo , mbedtls_2 , miniupnpc @@ -57,21 +57,17 @@ stdenv.mkDerivation rec { pname = "dolphin-emu"; - version = "5.0-19870"; + version = "5.0-20347"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "032c77b462a220016f23c5079e71bb23e0ad2adf"; - sha256 = "sha256-TgRattksYsMGcbfu4T5mCFO9BkkHRX0NswFxGwZWjEw="; + rev = "dc0814ae4622313d513468bdc377ee9c031de199"; + hash = "sha256-s3mGwXkgdoLLfPEUVyjaqXb+a5KPKC3dhHIyKC2BF1w="; fetchSubmodules = true; }; patches = [ - (fetchpatch { - url = "https://github.com/dolphin-emu/dolphin/commit/c43c9101c07376297abbbbc40ef9a1965a1681cd.diff"; - sha256 = "sha256-yHlyG86ta76YKrJsyefvFh521dNbQOqiPOpRUVxKuZM="; - }) # Remove when merged https://github.com/dolphin-emu/dolphin/pull/12070 ./find-minizip-ng.patch ]; @@ -99,7 +95,7 @@ stdenv.mkDerivation rec { curl enet ffmpeg - fmt_8 + fmt_10 gtest hidapi libiconv @@ -107,6 +103,7 @@ stdenv.mkDerivation rec { libspng libusb1 libXdmcp + lz4 lzo mbedtls_2 miniupnpc |