diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/by-name/pi/picocrypt/package.nix | 22 | ||||
-rw-r--r-- | pkgs/development/libraries/glfw/3.x.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 12 insertions, 18 deletions
diff --git a/pkgs/by-name/pi/picocrypt/package.nix b/pkgs/by-name/pi/picocrypt/package.nix index bd0fce2518d55..3823fdd1824f2 100644 --- a/pkgs/by-name/pi/picocrypt/package.nix +++ b/pkgs/by-name/pi/picocrypt/package.nix @@ -8,7 +8,7 @@ makeDesktopItem, xorg, - libGL, + glfw, gtk3, pkg-config, wrapGAppsHook3, @@ -34,18 +34,14 @@ buildGoModule rec { "-w" ]; - buildInputs = [ - xorg.libX11 - xorg.libXcursor - xorg.libXrandr - xorg.libXi - xorg.libXinerama - xorg.libXxf86vm - libGL.dev - gtk3 - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Kernel - ]; + buildInputs = + # Depends on a vendored, patched GLFW. + glfw.buildInputs or [ ] + ++ glfw.propagatedBuildInputs or [ ] + ++ lib.optionals (!stdenv.isDarwin) [ + gtk3 + xorg.libXxf86vm + ]; nativeBuildInputs = [ copyDesktopItems diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index 67d5a0095148b..7ca694827301b 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, cmake , libGL, libXrandr, libXinerama, libXcursor, libX11, libXi, libXext -, Carbon, Cocoa, Kernel, OpenGL, fixDarwinDylibNames +, Carbon, Cocoa, Kernel, fixDarwinDylibNames , extra-cmake-modules, wayland , wayland-scanner, wayland-protocols, libxkbcommon }: @@ -19,9 +19,7 @@ stdenv.mkDerivation rec { # Fix linkage issues on X11 (https://github.com/NixOS/nixpkgs/issues/142583) patches = ./x11.patch; - propagatedBuildInputs = - lib.optionals stdenv.isDarwin [ OpenGL ] - ++ lib.optionals stdenv.isLinux [ libGL ]; + propagatedBuildInputs = [ libGL ]; nativeBuildInputs = [ cmake extra-cmake-modules ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 54e21c68aa7bc..4788c979eefe4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20787,7 +20787,7 @@ with pkgs; glfw-wayland-minecraft = callPackage ../development/libraries/glfw/3.x-wayland-minecraft.nix {}; glfw2 = callPackage ../development/libraries/glfw/2.x.nix { }; glfw3 = callPackage ../development/libraries/glfw/3.x.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa Kernel OpenGL; + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa Kernel; }; glibc = callPackage ../development/libraries/glibc { |