ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-18 13:19:10 +03:00
Code Issues Projects Releases Wiki Activity

dolphinEmuMaster: remove unnecessary symlink, force xcb

Browse Source
This commit is contained in:
Martino Fontana 2021-11-10 17:45:53 +01:00
parent f6a3eba587
commit 940f3b60b9
1 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/misc/emulators/dolphin-emu/master.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, makeDesktopItem, pkg-config, cmake
{ lib, stdenv, fetchFromGitHub, pkg-config, cmake
, wrapQtAppsHook, qtbase, bluez, ffmpeg, libao, libGLU, libGL, pcre, gettext
, libXrandr, libusb1, lzo, libpthreadstubs, libXext, libXxf86vm, libXinerama
, libSM, libXdmcp, readline, openal, udev, libevdev, portaudio, curl, alsa-lib
@ -8,18 +8,7 @@
# - Inputs used for Darwin
, CoreBluetooth, ForceFeedback, IOKit, OpenGL, libpng, hidapi }:
let
desktopItem = makeDesktopItem {
name = "dolphin-emu-master";
exec = "dolphin-emu-master";
icon = "dolphin-emu";
comment = "A Wii/GameCube Emulator";
desktopName = "Dolphin Emulator (master)";
genericName = "Wii/GameCube Emulator";
categories = "Game;Emulator;";
startupNotify = "false";
};
in stdenv.mkDerivation rec {
stdenv.mkDerivation rec {
pname = "dolphin-emu";
version = "5.0-15260";
@ -57,6 +46,9 @@ in stdenv.mkDerivation rec {
qtWrapperArgs = lib.optionals stdenv.isLinux [
"--prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib"
# https://bugs.dolphin-emu.org/issues/11807
# The .desktop file should already set this, but Dolphin may be launched in other ways
"--set QT_QPA_PLATFORM xcb"
];
# - Allow Dolphin to use nix-provided libraries instead of building them
@ -68,10 +60,7 @@ in stdenv.mkDerivation rec {
CMakeLists.txt
'';
postInstall = ''
cp -r ${desktopItem}/share/applications $out/share
ln -sf $out/bin/dolphin-emu $out/bin/dolphin-emu-master
'' + lib.optionalString stdenv.hostPlatform.isLinux ''
postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
install -D $src/Data/51-usb-device.rules $out/etc/udev/rules.d/51-usb-device.rules
'';