diff options
author | Daiderd Jordan <daiderd@gmail.com> | 2019-06-19 20:10:14 +0200 |
---|---|---|
committer | Daiderd Jordan <daiderd@gmail.com> | 2019-07-03 22:20:15 +0200 |
commit | c585330a2117f8a77d0ebfd2bf8011ef8a6144d7 (patch) | |
tree | c9d51f01a95de2a1f54d55260ee260ca2a72eead /pkgs | |
parent | 91b595945e6fe98fa3bea50aa07f6e0f217c6c47 (diff) | |
download | nixpkgs-c585330a2117f8a77d0ebfd2bf8011ef8a6144d7.tar nixpkgs-c585330a2117f8a77d0ebfd2bf8011ef8a6144d7.tar.gz nixpkgs-c585330a2117f8a77d0ebfd2bf8011ef8a6144d7.tar.bz2 nixpkgs-c585330a2117f8a77d0ebfd2bf8011ef8a6144d7.tar.lz nixpkgs-c585330a2117f8a77d0ebfd2bf8011ef8a6144d7.tar.xz nixpkgs-c585330a2117f8a77d0ebfd2bf8011ef8a6144d7.tar.zst nixpkgs-c585330a2117f8a77d0ebfd2bf8011ef8a6144d7.zip |
glfw: remove cf-private
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/glfw/3.x.nix | 11 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 3 insertions, 9 deletions
diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index 668fe436e91..339ce1e5b12 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -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" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 298eb3f3843..7172ef4be8c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; }; |