summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorLuke Adams <luke.adams@belljar.io>2017-07-20 19:15:04 -0500
committerCray Elliott <MP2E@archlinux.us>2017-12-23 22:31:15 -0800
commit1852176d2e93e6d9617de63b0648c544b1217ec7 (patch)
tree59ca952f084abc35e068b07b2b78aef2f3fa9fa1 /pkgs/top-level
parent1e5973850e4589a65863e242431c029c6fc69bb4 (diff)
downloadnixlib-1852176d2e93e6d9617de63b0648c544b1217ec7.tar
nixlib-1852176d2e93e6d9617de63b0648c544b1217ec7.tar.gz
nixlib-1852176d2e93e6d9617de63b0648c544b1217ec7.tar.bz2
nixlib-1852176d2e93e6d9617de63b0648c544b1217ec7.tar.lz
nixlib-1852176d2e93e6d9617de63b0648c544b1217ec7.tar.xz
nixlib-1852176d2e93e6d9617de63b0648c544b1217ec7.tar.zst
nixlib-1852176d2e93e6d9617de63b0648c544b1217ec7.zip
dolphinEmuMaster: move inputs to nativeBuildInputs
- add Darwin inputs
- Add curl to prevent in-tree build
- add libpng hidapi wxgtk for dolphin to use
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix7
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1a14ed49c815..5c1fc21c4d61 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1839,8 +1839,11 @@ with pkgs;
   dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { };
 
   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) cf-private;
+    wxGTK = wxGTK31;
+  };
   doomseeker = callPackage ../applications/misc/doomseeker { };
 
   slade = callPackage ../applications/misc/slade {