diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-06-23 08:16:49 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-06-23 08:16:49 +0000 |
commit | 4dc730a187d41f9f2dce4fe2680c32dcecb79b93 (patch) | |
tree | 67673deb1649dc0a40962e70e6da302d7b6c4bf0 /nixpkgs/pkgs/development/libraries/incrtcl | |
parent | 633cab0ecb07627706c6b523e219490f019eaab5 (diff) | |
parent | 7e567a3d092b7de69cdf5deaeb8d9526de230916 (diff) | |
download | nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.gz nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.bz2 nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.lz nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.xz nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.zst nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.zip |
Merge commit '7e567a3d092b7de69cdf5deaeb8d9526de230916'
# Conflicts: # nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/incrtcl')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/incrtcl/default.nix | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/development/libraries/incrtcl/default.nix b/nixpkgs/pkgs/development/libraries/incrtcl/default.nix index 67ae5623db12..dae01961a10c 100644 --- a/nixpkgs/pkgs/development/libraries/incrtcl/default.nix +++ b/nixpkgs/pkgs/development/libraries/incrtcl/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, writeText, tcl }: -stdenv.mkDerivation rec { +tcl.mkTclDerivation rec { pname = "incrtcl"; version = "4.2.0"; @@ -9,18 +9,12 @@ 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 |