diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-07-17 10:43:50 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-07-17 10:43:50 +0200 |
commit | 15cd7af5223e67d37c43be66803d3a868f1b0e36 (patch) | |
tree | 65e5e01cf5132677c159b536310bb6cdb4cb5bfd | |
parent | 33476f33033fd5b1a7c9af5eb3ee7d1e9dbc9fec (diff) | |
parent | fbf41c6c7fffbcda99b9e9b388570c508be43085 (diff) | |
download | nixlib-15cd7af5223e67d37c43be66803d3a868f1b0e36.tar nixlib-15cd7af5223e67d37c43be66803d3a868f1b0e36.tar.gz nixlib-15cd7af5223e67d37c43be66803d3a868f1b0e36.tar.bz2 nixlib-15cd7af5223e67d37c43be66803d3a868f1b0e36.tar.lz nixlib-15cd7af5223e67d37c43be66803d3a868f1b0e36.tar.xz nixlib-15cd7af5223e67d37c43be66803d3a868f1b0e36.tar.zst nixlib-15cd7af5223e67d37c43be66803d3a868f1b0e36.zip |
Merge #16968: fltk: darwin compatibility
-rw-r--r-- | pkgs/development/libraries/fltk/default.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix index 772ea2030c2a..99cb8aae3236 100644 --- a/pkgs/development/libraries/fltk/default.nix +++ b/pkgs/development/libraries/fltk/default.nix @@ -1,6 +1,7 @@ { stdenv, composableDerivation, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi , freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng , cfg ? {} +, darwin, libtiff, freetype }: let inherit (composableDerivation) edf; in @@ -21,7 +22,10 @@ composableDerivation.composableDerivation {} { ''; nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ xlibsWrapper inputproto libXi freeglut ]; + propagatedBuildInputs = [ inputproto ] + ++ (if stdenv.isDarwin + then (with darwin.apple_sdk.frameworks; [Cocoa AGL GLUT freetype libtiff]) + else [ xlibsWrapper libXi freeglut ]); enableParallelBuilding = true; @@ -55,9 +59,8 @@ composableDerivation.composableDerivation {} { meta = { description = "A C++ cross-platform lightweight GUI library"; homepage = http://www.fltk.org; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; license = stdenv.lib.licenses.gpl2; }; } - |