public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dolphin-emu: remove cf-private

Browse Source
This commit is contained in:
Daiderd Jordan 2019-06-19 19:50:52 +02:00
parent 11bd54cda3
commit 956c197ee6
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@
, soundtouch, sfml, vulkan-loader ? null, libpulseaudio ? null , soundtouch, sfml, vulkan-loader ? null, libpulseaudio ? null
# - Inputs used for Darwin # - Inputs used for Darwin
, CoreBluetooth, cf-private, ForceFeedback, IOKit, OpenGL, libpng, hidapi }: , CoreBluetooth, ForceFeedback, IOKit, OpenGL, libpng, hidapi }:
let let
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
@ -41,7 +41,7 @@ in stdenv.mkDerivation rec {
] ++ stdenv.lib.optionals stdenv.isLinux [ ] ++ stdenv.lib.optionals stdenv.isLinux [
bluez udev libevdev alsaLib vulkan-loader bluez udev libevdev alsaLib vulkan-loader
] ++ stdenv.lib.optionals stdenv.isDarwin [ ] ++ stdenv.lib.optionals stdenv.isDarwin [
CoreBluetooth cf-private OpenGL ForceFeedback IOKit CoreBluetooth OpenGL ForceFeedback IOKit
]; ];
cmakeFlags = [ cmakeFlags = [

1
pkgs/top-level/all-packages.nix
View File

@ -2552,7 +2552,6 @@ in
dolphinEmu = callPackage ../misc/emulators/dolphin-emu { }; dolphinEmu = callPackage ../misc/emulators/dolphin-emu { };
dolphinEmuMaster = callPackage ../misc/emulators/dolphin-emu/master.nix { dolphinEmuMaster = callPackage ../misc/emulators/dolphin-emu/master.nix {
inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL; inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL;
inherit (darwin) cf-private;
}; };
doomseeker = qt5.callPackage ../applications/misc/doomseeker { }; doomseeker = qt5.callPackage ../applications/misc/doomseeker { };