swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 12:29:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #145384 from SuperSamus/dolphin

Browse source 
dolphinEmu{Master}: removed unnecesary symlink, rename to dolphin-emu{-beta}
This commit is contained in:
Thiago Kenji Okada 2021-11-11 23:04:13 -03:00 committed by GitHub
parent 6c9ac6fb13 34503b8bb7
commit 4a9343eb3b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 19 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
'';

2
pkgs/top-level/aliases.nix
View file

@ -202,6 +202,8 @@ mapAliases ({
dnnl = oneDNN; # added 2020-04-22
docbook5_xsl = docbook_xsl_ns; # added 2018-04-25
docbook_xml_xslt = docbook_xsl; # added 2018-04-25
dolphinEmu = dolphin-emu; # added 2021-11-10
dolphinEmuMaster = dolphin-emu-beta; # added 2021-11-10
dotnet-netcore = dotnet-runtime; # added 2021-10-07
double_conversion = double-conversion; # 2017-11-22
docker_compose = docker-compose; # 2018-11-10

4
pkgs/top-level/all-packages.nix
View file

@ -4578,8 +4578,8 @@ with pkgs;
dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { };
dolphinEmu = callPackage ../misc/emulators/dolphin-emu { };
dolphinEmuMaster = qt5.callPackage ../misc/emulators/dolphin-emu/master.nix {
dolphin-emu = callPackage ../misc/emulators/dolphin-emu { };
dolphin-emu-beta = qt5.callPackage ../misc/emulators/dolphin-emu/master.nix {
inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL;
};