diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2019-06-19 19:50:52 +0200 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2019-07-03 22:20:11 +0200 |
| commit | 956c197ee613d0f6b4bff68d3e45765b5f0f01e1 (patch) | |
| tree | 6351c4bb6456d60726116ac28c2a93d759d13392 /pkgs | |
| parent | 11bd54cda3258771f02f8c4263cc47d79b47f1f5 (diff) | |
| download | nixpkgs-956c197ee613d0f6b4bff68d3e45765b5f0f01e1.tar nixpkgs-956c197ee613d0f6b4bff68d3e45765b5f0f01e1.tar.gz nixpkgs-956c197ee613d0f6b4bff68d3e45765b5f0f01e1.tar.bz2 nixpkgs-956c197ee613d0f6b4bff68d3e45765b5f0f01e1.tar.lz nixpkgs-956c197ee613d0f6b4bff68d3e45765b5f0f01e1.tar.xz nixpkgs-956c197ee613d0f6b4bff68d3e45765b5f0f01e1.tar.zst nixpkgs-956c197ee613d0f6b4bff68d3e45765b5f0f01e1.zip | |
dolphin-emu: remove cf-private
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/misc/emulators/dolphin-emu/master.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index d44560b4ddf..6f32e91044c 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -5,7 +5,7 @@ , soundtouch, sfml, vulkan-loader ? null, libpulseaudio ? null # - Inputs used for Darwin -, CoreBluetooth, cf-private, ForceFeedback, IOKit, OpenGL, libpng, hidapi }: +, CoreBluetooth, ForceFeedback, IOKit, OpenGL, libpng, hidapi }: let desktopItem = makeDesktopItem { @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { ] ++ stdenv.lib.optionals stdenv.isLinux [ bluez udev libevdev alsaLib vulkan-loader ] ++ stdenv.lib.optionals stdenv.isDarwin [ - CoreBluetooth cf-private OpenGL ForceFeedback IOKit + CoreBluetooth OpenGL ForceFeedback IOKit ]; cmakeFlags = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index af4df503d7e..c5eb41b6a05 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2552,7 +2552,6 @@ in dolphinEmu = callPackage ../misc/emulators/dolphin-emu { }; dolphinEmuMaster = callPackage ../misc/emulators/dolphin-emu/master.nix { inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL; - inherit (darwin) cf-private; }; doomseeker = qt5.callPackage ../applications/misc/doomseeker { }; |