public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glfw: add cf-private on darwin

Browse Source 
Undefined symbols for architecture x86_64:
      "_NSDefaultRunLoopMode", referenced from:
          __glfwPlatformPollEvents in cocoa_window.m.o
          __glfwPlatformWaitEvents in cocoa_window.m.o
          __glfwPlatformWaitEventsTimeout in cocoa_window.m.o
      "_OBJC_CLASS_$_NSArray", referenced from:
          objc-class-ref in cocoa_window.m.o
      "_OBJC_CLASS_$_NSDate", referenced from:
          objc-class-ref in cocoa_window.m.o
    ld: symbol(s) not found for architecture x86_64
This commit is contained in:
Daiderd Jordan 2018-11-07 19:54:16 +01:00
parent 78623f492c
commit 388a868d6d
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/glfw/3.x.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, cmake, libGL, libXrandr, libXinerama, libXcursor, libX11 { stdenv, lib, fetchFromGitHub, cmake, libGL, libXrandr, libXinerama, libXcursor, libX11
, darwin, fixDarwinDylibNames , cf-private, Cocoa, Kernel, fixDarwinDylibNames
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -21,7 +21,11 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
libX11 libXrandr libXinerama libXcursor libX11 libXrandr libXinerama libXcursor
] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Cocoa Kernel fixDarwinDylibNames ]); ] ++ lib.optionals stdenv.isDarwin [
Cocoa Kernel fixDarwinDylibNames
# Needed for NSDefaultRunLoopMode symbols.
cf-private
];
cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];

5
pkgs/top-level/all-packages.nix
View File

@ -9731,7 +9731,10 @@ with pkgs;
glfw = glfw3; glfw = glfw3;
glfw2 = callPackage ../development/libraries/glfw/2.x.nix { }; glfw2 = callPackage ../development/libraries/glfw/2.x.nix { };
glfw3 = callPackage ../development/libraries/glfw/3.x.nix { }; glfw3 = callPackage ../development/libraries/glfw/3.x.nix {
inherit (darwin) cf-private;
inherit (darwin.apple_sdk.frameworks) Cocoa Kernel;
};
glibc = callPackage ../development/libraries/glibc { glibc = callPackage ../development/libraries/glibc {
installLocales = config.glibc.locales or false; installLocales = config.glibc.locales or false;