commit 5acf84a5abb68a02cc8855343876611c6d7b6043 · pyrox.dev/nixpkgs

+8 -4

pkgs/applications/emulators/dolphin-emu/master.nix

···

       23
       23
        
       , mbedtls_2

     

       24
       24
        
       , soundtouch

     

       25
       25
        
       , sfml

     

       26
       26
       +
       , minizip-ng

     

       26
       27
        
       , xz

     

       27
       28
        
       , hidapi

     

       28
       29
        
       , fmt_8

     
···

       52
       53
        
       

     

       53
       54
        
       stdenv.mkDerivation rec {

     

       54
       55
        
         pname = "dolphin-emu";

     

       55
       55
       -
         version = "5.0-17269";

     

       56
       56
       +
         version = "5.0-17995";

     

       56
       57
        
       

     

       57
       58
        
         src = fetchFromGitHub {

     

       58
       59
        
           owner = "dolphin-emu";

     

       59
       60
        
           repo = "dolphin";

     

       60
       60
       -
           rev = "48c9c224cf9f82f0f9f2690b7cc6283d7448480c";

     

       61
       61
       -
           sha256 = "sha256-WC3jukRygZigLx987CzRmOmJ7DeS1atXrMzU98sRzEg=";

     

       61
       61
       +
           rev = "8bad821019721b9b72701b495da95656ace5fea5";

     

       62
       62
       +
           sha256 = "sha256-uxHzn+tXRBr11OPpZ4ELBw7DTJH4mnqUBOeyPlXNAh8=";

     

       62
       63
        
           fetchSubmodules = true;

     

       63
       64
        
         };

     

       64
       65
        
       

     
···

       93
       94
        
           mbedtls_2

     

       94
       95
        
           soundtouch

     

       95
       96
        
           sfml

     

       97
       97
       +
           minizip-ng

     

       96
       98
        
           xz

     

       97
       99
        
           qtbase

     

       98
       100
        
           fmt_8

     
···

       131
       133
        
         ];

     

       132
       134
        
       

     

       133
       135
        
         qtWrapperArgs = lib.optionals stdenv.isLinux [

     

       134
       134
       -
           "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [vulkan-loader]}"

     

       136
       136
       +
           "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}"

     

       135
       137
        
           # https://bugs.dolphin-emu.org/issues/11807

     

       136
       138
        
           # The .desktop file should already set this, but Dolphin may be launched in other ways

     

       137
       139
        
           "--set QT_QPA_PLATFORM xcb"

     

       140
       140
       +
           # https://bugs.dolphin-emu.org/issues/12913

     

       141
       141
       +
           "--set QT_XCB_NO_XI2 1"

     

       138
       142
        
         ];

     

       139
       143
        
       

     

       140
       144
        
         # Use nix-provided libraries instead of submodules

+1 -1

pkgs/top-level/all-packages.nix

···

       2200
       2200
        
       

     

       2201
       2201
        
         dolphin-emu = callPackage ../applications/emulators/dolphin-emu { };

     

       2202
       2202
        
       

     

       2203
       2203
       -
         dolphin-emu-beta = qt5.callPackage ../applications/emulators/dolphin-emu/master.nix {

     

       2203
       2203
       +
         dolphin-emu-beta = qt6Packages.callPackage ../applications/emulators/dolphin-emu/master.nix {

     

       2204
       2204
        
           inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL VideoToolbox;

     

       2205
       2205
        
           inherit (darwin) moltenvk;

     

       2206
       2206
        
         };