Unverified Commit 3f2ede54 authored by K900's avatar K900 Committed by GitHub
Browse files

Merge pull request #324580 from emilazy/push-lwlsznppxpzw 

[staging-next] picocrypt: fix evaluation on Darwin
parents 36cbae9f a5b1dedb

pkgs/by-name/pi/picocrypt/package.nix

+9 −13
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
  makeDesktopItem,



  xorg,

  libGL,

  glfw,

  gtk3,

  pkg-config,

  wrapGAppsHook3,
@@ -34,17 +34,13 @@ buildGoModule rec { 
    "-w"

  ];



  buildInputs = [

    xorg.libX11

    xorg.libXcursor

    xorg.libXrandr

    xorg.libXi

    xorg.libXinerama

    xorg.libXxf86vm

    libGL.dev

  buildInputs =

    # Depends on a vendored, patched GLFW.

    glfw.buildInputs or [ ]

    ++ glfw.propagatedBuildInputs or [ ]

    ++ lib.optionals (!stdenv.isDarwin) [

      gtk3

  ] ++ lib.optionals stdenv.isDarwin [

    darwin.apple_sdk.frameworks.Kernel

      xorg.libXxf86vm

    ];



  nativeBuildInputs = [

pkgs/development/libraries/glfw/3.x.nix

+2 −4
Original line number Diff line number Diff line 
{ 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

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -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 {