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

tk: use aqua backend on darwin

Browse Source 
Most users don’t have xquartz, so let’s use the default window system
for macOS.
This commit is contained in:
Matthew Bauer 2019-04-09 21:44:38 -04:00
parent 11a6d01db6
commit 82b8393bc4
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/libraries/tk/generic.nix
View File

@ -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 { stdenv.mkDerivation {
name = "tk-${tcl.version}"; name = "tk-${tcl.version}";
@ -21,15 +23,14 @@ stdenv.mkDerivation {
configureFlags = [ configureFlags = [
"--with-tcl=${tcl}/lib" "--with-tcl=${tcl}/lib"
]; ] ++ stdenv.lib.optional enableAqua "--enable-aqua";
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ ]
++ stdenv.lib.optional stdenv.isDarwin fontconfig;
propagatedBuildInputs = [ tcl libXft ]; propagatedBuildInputs = [ tcl libXft ];
buildInputs = lib.optional enableAqua (with darwin; with apple_sdk.frameworks; [
NIX_CFLAGS_LINK = if stdenv.isDarwin then "-lfontconfig" else null; Cocoa cf-private
]);
doCheck = false; # fails. can't find itself doCheck = false; # fails. can't find itself