pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #279439 from qubitnano/dolphin

dolphin-emu: 5.0-19870 -> 5.0-20347

authored by a-n-n-a-l-e-e and committed by GitHub 5ecc5d40 11b3045a

+7 -10
unified split
+7 -10
pkgs/applications/emulators/dolphin-emu/default.nix
··· 1 { lib 2 , stdenv 3 , fetchFromGitHub 4 - , fetchpatch 5 , cmake 6 , pkg-config 7 , wrapQtAppsHook ··· 12 , curl 13 , enet 14 , ffmpeg 15 - , fmt_8 16 , gtest 17 , hidapi 18 , libevdev ··· 24 , libXdmcp 25 , libXext 26 , libXrandr 27 , lzo 28 , mbedtls_2 29 , miniupnpc ··· 57 58 stdenv.mkDerivation rec { 59 pname = "dolphin-emu"; 60 - version = "5.0-19870"; 61 62 src = fetchFromGitHub { 63 owner = "dolphin-emu"; 64 repo = "dolphin"; 65 - rev = "032c77b462a220016f23c5079e71bb23e0ad2adf"; 66 - sha256 = "sha256-TgRattksYsMGcbfu4T5mCFO9BkkHRX0NswFxGwZWjEw="; 67 fetchSubmodules = true; 68 }; 69 70 patches = [ 71 - (fetchpatch { 72 - url = "https://github.com/dolphin-emu/dolphin/commit/c43c9101c07376297abbbbc40ef9a1965a1681cd.diff"; 73 - sha256 = "sha256-yHlyG86ta76YKrJsyefvFh521dNbQOqiPOpRUVxKuZM="; 74 - }) 75 # Remove when merged https://github.com/dolphin-emu/dolphin/pull/12070 76 ./find-minizip-ng.patch 77 ]; ··· 99 curl 100 enet 101 ffmpeg 102 - fmt_8 103 gtest 104 hidapi 105 libiconv ··· 107 libspng 108 libusb1 109 libXdmcp 110 lzo 111 mbedtls_2 112 miniupnpc
··· 1 { lib 2 , stdenv 3 , fetchFromGitHub 4 , cmake 5 , pkg-config 6 , wrapQtAppsHook ··· 11 , curl 12 , enet 13 , ffmpeg 14 + , fmt_10 15 , gtest 16 , hidapi 17 , libevdev ··· 23 , libXdmcp 24 , libXext 25 , libXrandr 26 + , lz4 27 , lzo 28 , mbedtls_2 29 , miniupnpc ··· 57 58 stdenv.mkDerivation rec { 59 pname = "dolphin-emu"; 60 + version = "5.0-20347"; 61 62 src = fetchFromGitHub { 63 owner = "dolphin-emu"; 64 repo = "dolphin"; 65 + rev = "dc0814ae4622313d513468bdc377ee9c031de199"; 66 + hash = "sha256-s3mGwXkgdoLLfPEUVyjaqXb+a5KPKC3dhHIyKC2BF1w="; 67 fetchSubmodules = true; 68 }; 69 70 patches = [ 71 # Remove when merged https://github.com/dolphin-emu/dolphin/pull/12070 72 ./find-minizip-ng.patch 73 ]; ··· 95 curl 96 enet 97 ffmpeg 98 + fmt_10 99 gtest 100 hidapi 101 libiconv ··· 103 libspng 104 libusb1 105 libXdmcp 106 + lz4 107 lzo 108 mbedtls_2 109 miniupnpc