tk: Simplify package with tcl.mkTclDerivation
This commit is contained in:
parent
5f3066af19
commit
98b8fc3579
|
@ -2,7 +2,7 @@
|
||||||
, enableAqua ? stdenv.isDarwin, darwin
|
, enableAqua ? stdenv.isDarwin, darwin
|
||||||
, ... }:
|
, ... }:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
tcl.mkTclDerivation {
|
||||||
name = "tk-${tcl.version}";
|
name = "tk-${tcl.version}";
|
||||||
|
|
||||||
inherit src patches;
|
inherit src patches;
|
||||||
|
@ -33,14 +33,13 @@ stdenv.mkDerivation {
|
||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--enable-threads"
|
"--enable-threads"
|
||||||
"--with-tcl=${tcl}/lib"
|
|
||||||
] ++ lib.optional stdenv.is64bit "--enable-64bit"
|
] ++ lib.optional stdenv.is64bit "--enable-64bit"
|
||||||
++ lib.optional enableAqua "--enable-aqua";
|
++ lib.optional enableAqua "--enable-aqua";
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
buildInputs = lib.optional enableAqua (with darwin.apple_sdk.frameworks; [ Cocoa ]);
|
buildInputs = lib.optional enableAqua (with darwin.apple_sdk.frameworks; [ Cocoa ]);
|
||||||
|
|
||||||
propagatedBuildInputs = [ tcl libXft ];
|
propagatedBuildInputs = [ libXft ];
|
||||||
|
|
||||||
doCheck = false; # fails. can't find itself
|
doCheck = false; # fails. can't find itself
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue