diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-09 21:44:38 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-09 21:44:38 -0400 |
| commit | 82b8393bc4d102ea31b03d05fa0f3d2026e9976d (patch) | |
| tree | 641380939e32f1bae9a732e0328d7c29d72cfbb7 /pkgs/development/libraries/tk | |
| parent | 11a6d01db6685344d1ef6d1363e2437be3a60614 (diff) | |
| download | nixlib-82b8393bc4d102ea31b03d05fa0f3d2026e9976d.tar nixlib-82b8393bc4d102ea31b03d05fa0f3d2026e9976d.tar.gz nixlib-82b8393bc4d102ea31b03d05fa0f3d2026e9976d.tar.bz2 nixlib-82b8393bc4d102ea31b03d05fa0f3d2026e9976d.tar.lz nixlib-82b8393bc4d102ea31b03d05fa0f3d2026e9976d.tar.xz nixlib-82b8393bc4d102ea31b03d05fa0f3d2026e9976d.tar.zst nixlib-82b8393bc4d102ea31b03d05fa0f3d2026e9976d.zip | |
tk: use aqua backend on darwin
Most users don’t have xquartz, so let’s use the default window system for macOS.
Diffstat (limited to 'pkgs/development/libraries/tk')
| -rw-r--r-- | pkgs/development/libraries/tk/generic.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix index b3cc2b7506b1..d5eaff77c117 100644 --- a/pkgs/development/libraries/tk/generic.nix +++ b/pkgs/development/libraries/tk/generic.nix @@ -1,4 +1,6 @@ -{ stdenv, src, pkgconfig, tcl, libXft, fontconfig, patches ? [], ... }: +{ stdenv, lib, src, pkgconfig, tcl, libXft, fontconfig, patches ? [] +, enableAqua ? stdenv.isDarwin, darwin +, ... }: stdenv.mkDerivation { name = "tk-${tcl.version}"; @@ -21,15 +23,14 @@ stdenv.mkDerivation { configureFlags = [ "--with-tcl=${tcl}/lib" - ]; + ] ++ stdenv.lib.optional enableAqua "--enable-aqua"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ] - ++ stdenv.lib.optional stdenv.isDarwin fontconfig; propagatedBuildInputs = [ tcl libXft ]; - - NIX_CFLAGS_LINK = if stdenv.isDarwin then "-lfontconfig" else null; + buildInputs = lib.optional enableAqua (with darwin; with apple_sdk.frameworks; [ + Cocoa cf-private + ]); doCheck = false; # fails. can't find itself |