From c585330a2117f8a77d0ebfd2bf8011ef8a6144d7 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 19 Jun 2019 20:10:14 +0200 Subject: [PATCH] glfw: remove cf-private --- pkgs/development/libraries/glfw/3.x.nix | 11 +++-------- 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 668fe436e915..339ce1e5b129 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 298eb3f38432..7172ef4be8c4 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; };