alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

glfw: remove cf-private

Browse source
This commit is contained in:
Daiderd Jordan 2019-06-19 20:10:14 +02:00
parent 91b595945e
commit c585330a21
No known key found for this signature in database
GPG key ID: D02435D05B810C96
2 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/development/libraries/glfw/3.x.nix
View file

@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, cmake, libGL, libXrandr, libXinerama, libXcursor, libX11
, cf-private, Cocoa, Kernel, fixDarwinDylibNames
, Cocoa, Kernel, fixDarwinDylibNames
}:
stdenv.mkDerivation rec {
@ -19,13 +19,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = [
libX11 libXrandr libXinerama libXcursor
] ++ lib.optionals stdenv.isDarwin [
Cocoa Kernel fixDarwinDylibNames
# Needed for NSDefaultRunLoopMode symbols.
cf-private
];
buildInputs = [ libX11 libXrandr libXinerama libXcursor ]
++ lib.optionals stdenv.isDarwin [ Cocoa Kernel fixDarwinDylibNames ];
cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];

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

@ -10581,7 +10581,6 @@ in
glfw = glfw3;
glfw2 = callPackage ../development/libraries/glfw/2.x.nix { };
glfw3 = callPackage ../development/libraries/glfw/3.x.nix {
inherit (darwin) cf-private;
inherit (darwin.apple_sdk.frameworks) Cocoa Kernel;
};