Merge pull request #233210 from SuperSamus/dolphin-emu
This commit is contained in:
commit
5b57136c60
1 changed files with 6 additions and 5 deletions
|
@ -55,13 +55,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "dolphin-emu";
|
pname = "dolphin-emu";
|
||||||
version = "5.0-18498";
|
version = "5.0-19368";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "dolphin-emu";
|
owner = "dolphin-emu";
|
||||||
repo = "dolphin";
|
repo = "dolphin";
|
||||||
rev = "46b99671d9158e0ca840c1d8ef249db0f321ced7";
|
rev = "dadbeb4bae7e7fa23af2b46e0add4143094dc107";
|
||||||
sha256 = "sha256-K+OF8o8I1XDLQQcsWC8p8jUuWeb+RoHlBG3cEZ1aWIU=";
|
sha256 = "sha256-XLtFn2liONPizvrKyySZx0mY7qC2fpwhAWaRZLlEzh8=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -101,7 +101,8 @@ stdenv.mkDerivation rec {
|
||||||
libevdev
|
libevdev
|
||||||
libXext
|
libXext
|
||||||
libXrandr
|
libXrandr
|
||||||
mgba # Derivation doesn't support Darwin
|
# FIXME: Remove comment on next mgba version
|
||||||
|
#mgba # Derivation doesn't support Darwin
|
||||||
udev
|
udev
|
||||||
vulkan-loader
|
vulkan-loader
|
||||||
] ++ lib.optionals stdenv.isDarwin [
|
] ++ lib.optionals stdenv.isDarwin [
|
||||||
|
@ -126,7 +127,7 @@ stdenv.mkDerivation rec {
|
||||||
# Bundles the application folder into a standalone executable, so we cannot devendor libraries
|
# Bundles the application folder into a standalone executable, so we cannot devendor libraries
|
||||||
"-DSKIP_POSTPROCESS_BUNDLE=ON"
|
"-DSKIP_POSTPROCESS_BUNDLE=ON"
|
||||||
# Needs xcode so compilation fails with it enabled. We would want the version to be fixed anyways.
|
# Needs xcode so compilation fails with it enabled. We would want the version to be fixed anyways.
|
||||||
# Note: The updater isn't available on linux, so we dont need to disable it there.
|
# Note: The updater isn't available on linux, so we don't need to disable it there.
|
||||||
"-DENABLE_AUTOUPDATE=OFF"
|
"-DENABLE_AUTOUPDATE=OFF"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue