diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/tk/generic.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/tk/generic.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/libraries/tk/generic.nix b/nixpkgs/pkgs/development/libraries/tk/generic.nix index d5eaff77c117..10b8bc7cd717 100644 --- a/nixpkgs/pkgs/development/libraries/tk/generic.nix +++ b/nixpkgs/pkgs/development/libraries/tk/generic.nix @@ -19,16 +19,19 @@ stdenv.mkDerivation { postInstall = '' ln -s $out/bin/wish* $out/bin/wish cp ../{unix,generic}/*.h $out/include + ln -s $out/lib/libtk${tcl.release}.so $out/lib/libtk.so ''; configureFlags = [ + "--enable-threads" "--with-tcl=${tcl}/lib" - ] ++ stdenv.lib.optional enableAqua "--enable-aqua"; + ] ++ stdenv.lib.optional stdenv.is64bit "--enable-64bit" + ++ stdenv.lib.optional enableAqua "--enable-aqua"; nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ tcl libXft ]; - buildInputs = lib.optional enableAqua (with darwin; with apple_sdk.frameworks; [ + propagatedBuildInputs = [ tcl libXft ] + ++ lib.optional enableAqua (with darwin; with apple_sdk.frameworks; [ Cocoa cf-private ]); @@ -44,7 +47,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A widget toolkit that provides a library of basic elements for building a GUI in many different programming languages"; - homepage = http://www.tcl.tk/; + homepage = https://www.tcl.tk/; license = licenses.tcltk; platforms = platforms.all; maintainers = with maintainers; [ lovek323 vrthra ]; |