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

Merge pull request #59240 from matthewbauer/fix-tk-on-macos

Browse Source 
tk: use aqua backend on darwin
This commit is contained in:
John Ericson 2019-04-09 22:50:38 -04:00 committed by GitHub
commit 43cfb6e570
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 {
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