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

Merge pull request #25308 from acowley/glfw-id

Browse Source 
glfw: fix the install name id on darwin
This commit is contained in:
Daiderd Jordan 2017-05-01 22:08:42 +02:00 committed by GitHub
commit 1046723ff6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, mesa, libXrandr, libXi, libXxf86vm, libXfixes, xlibsWrapper { stdenv, fetchFromGitHub, cmake, mesa, libXrandr, libXi, libXxf86vm, libXfixes, xlibsWrapper
, libXinerama, libXcursor , libXinerama, libXcursor
, darwin , darwin, fixDarwinDylibNames
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
cmake mesa libXrandr libXi libXxf86vm libXfixes xlibsWrapper cmake mesa libXrandr libXi libXxf86vm libXfixes xlibsWrapper
libXinerama libXcursor libXinerama libXcursor
] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Cocoa Kernel ]); ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Cocoa Kernel fixDarwinDylibNames ]);
cmakeFlags = "-DBUILD_SHARED_LIBS=ON"; cmakeFlags = "-DBUILD_SHARED_LIBS=ON";
@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
homepage = "http://www.glfw.org/"; homepage = "http://www.glfw.org/";
license = licenses.zlib; license = licenses.zlib;
maintainers = with maintainers; [ marcweber ]; maintainers = with maintainers; [ marcweber ];
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }