diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
commit | 62614cbef7da005c1eda8c9400160f6bcd6546b8 (patch) | |
tree | c2630f69080637987b68acb1ee8676d2681fe304 /pkgs/development/libraries/incrtcl | |
parent | d9c82ed3044c72cecf01c6ea042489d30914577c (diff) | |
parent | e24069138dfec3ef94f211f1da005bb5395adc11 (diff) | |
download | nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.gz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.bz2 nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.lz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.xz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.zst nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.zip |
Merge branch 'nixpkgs-update' into master
Diffstat (limited to 'pkgs/development/libraries/incrtcl')
-rw-r--r-- | pkgs/development/libraries/incrtcl/default.nix | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/pkgs/development/libraries/incrtcl/default.nix b/pkgs/development/libraries/incrtcl/default.nix index 614a8f048aa..dae01961a10 100644 --- a/pkgs/development/libraries/incrtcl/default.nix +++ b/pkgs/development/libraries/incrtcl/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, writeText, tcl }: +{ lib, stdenv, fetchurl, writeText, tcl }: -stdenv.mkDerivation rec { +tcl.mkTclDerivation rec { pname = "incrtcl"; version = "4.2.0"; @@ -9,21 +9,17 @@ stdenv.mkDerivation rec { sha256 = "0w28v0zaraxcq1s9pa6cihqqwqvvwfgz275lks7w4gl7hxjxmasw"; }; - buildInputs = [ tcl ]; - configureFlags = [ "--with-tcl=${tcl}/lib" ]; enableParallelBuilding = true; patchPhase = '' substituteInPlace configure --replace "\''${TCL_SRC_DIR}/generic" "${tcl}/include" ''; - preConfigure = '' - configureFlags="--exec_prefix=$prefix $configureFlags" - ''; - postInstall = '' rmdir $out/bin mv $out/lib/itcl${version}/* $out/lib + ln -s libitcl${version}${stdenv.hostPlatform.extensions.sharedLibrary} \ + $out/lib/libitcl${lib.versions.major version}${stdenv.hostPlatform.extensions.sharedLibrary} rmdir $out/lib/itcl${version} ''; @@ -33,7 +29,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://incrtcl.sourceforge.net/"; description = "Object Oriented Enhancements for Tcl/Tk"; license = licenses.tcltk; |