diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2017-09-27 23:28:36 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2017-09-27 23:31:07 +0300 |
| commit | 98ef62e51a0e14fb836f00667832a208c16a8c80 (patch) | |
| tree | 9196764a30ddb53dbdb229fa63f2f5a1114a9110 /pkgs | |
| parent | d68e9b4938c5b279b7d229fd6c29a0071ce3d492 (diff) | |
| download | nixlib-98ef62e51a0e14fb836f00667832a208c16a8c80.tar nixlib-98ef62e51a0e14fb836f00667832a208c16a8c80.tar.gz nixlib-98ef62e51a0e14fb836f00667832a208c16a8c80.tar.bz2 nixlib-98ef62e51a0e14fb836f00667832a208c16a8c80.tar.lz nixlib-98ef62e51a0e14fb836f00667832a208c16a8c80.tar.xz nixlib-98ef62e51a0e14fb836f00667832a208c16a8c80.tar.zst nixlib-98ef62e51a0e14fb836f00667832a208c16a8c80.zip | |
glfw3: cleanup dependencies, propagate mesa_noglu
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/glfw/3.x.nix | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index 52673061b72c..c10b3c05986a 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -1,5 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, mesa, libXrandr, libXi, libXxf86vm, libXfixes, xlibsWrapper -, libXinerama, libXcursor +{ stdenv, lib, fetchFromGitHub, cmake, mesa_noglu, libXrandr, libXinerama, libXcursor, libX11 , darwin, fixDarwinDylibNames }: @@ -16,12 +15,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + propagatedBuildInputs = [ mesa_noglu ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ - cmake mesa libXrandr libXi libXxf86vm libXfixes xlibsWrapper - libXinerama libXcursor - ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Cocoa Kernel fixDarwinDylibNames ]); + libX11 libXrandr libXinerama libXcursor + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Cocoa Kernel fixDarwinDylibNames ]); - cmakeFlags = "-DBUILD_SHARED_LIBS=ON"; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; meta = with stdenv.lib; { description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time"; |