1 files changed, 8 insertions, 9 deletions
diff --git a/pkgs/development/libraries/tix/default.nix b/pkgs/development/libraries/tix/default.nix
index f0b460b6f3d..c42847ef533 100644
--- a/pkgs/development/libraries/tix/default.nix
+++ b/pkgs/development/libraries/tix/default.nix
@@ -1,29 +1,29 @@
-{ stdenv, fetchurl, tcl, tk, fetchpatch } :
+{ lib, stdenv, fetchurl, tcl, tk, fetchpatch } :
 
-stdenv.mkDerivation {
+tcl.mkTclDerivation {
   version = "8.4.3";
   pname = "tix";
   src = fetchurl {
      url = "mirror://sourceforge/tix/tix/8.4.3/Tix8.4.3-src.tar.gz";
      sha256 = "1jq3dkyk9mqkj4cg7mdk5r0cclqsby9l2b7wrysi0zk5yw7h8bsn";
   };
-  patches = [ 
+  patches = [
   (fetchpatch {
     name = "tix-8.4.3-tcl8.5.patch";
     url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-tcltk/tix/files/tix-8.4.3-tcl8.5.patch?id=56bd759df1d0c750a065b8c845e93d5dfa6b549d";
     sha256 = "0wzqmcxxq0rqpnjgxz10spw92yhfygnlwv0h8pcx2ycnqiljz6vj";
     })
-  ] ++ stdenv.lib.optional (tcl.release == "8.6")
+  ] ++ lib.optional (tcl.release == "8.6")
   (fetchpatch {
     name = "tix-8.4.3-tcl8.6.patch";
     url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-tcltk/tix/files/tix-8.4.3-tcl8.6.patch?id=56bd759df1d0c750a065b8c845e93d5dfa6b549d";
     sha256 = "1jaz0l22xj7x1k4rb9ia6i1psnbwk4pblgq4gfvya7gg7fbb7r36";
     })
   ;
-  buildInputs = [ tcl tk ];
+  buildInputs = [ tk ];
   # the configure script expects to find the location of the sources of
   # tcl and tk in {tcl,tk}Config.sh
-  # In fact, it only needs some private headers. We copy them in 
+  # In fact, it only needs some private headers. We copy them in
   # the private_headers folders and trick the configure script into believing
   # the sources are here.
   preConfigure = ''
@@ -34,15 +34,15 @@ stdenv.mkDerivation {
       ln -s $i private_headers/generic;
     done;
     '';
+  addTclConfigureFlags = false;
   configureFlags = [
-    "--with-tclinclude=${tcl}/include"
     "--with-tclconfig=."
     "--with-tkinclude=${tk.dev}/include"
     "--with-tkconfig=."
     "--libdir=\${prefix}/lib"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A widget library for Tcl/Tk";
     homepage    = "http://tix.sourceforge.net/";
     platforms   = platforms.all;
@@ -52,4 +52,3 @@ stdenv.mkDerivation {
     ];
   };
 }
-