From bf222c3835a917ccc9d474a80f272e3a0be314c4 Mon Sep 17 00:00:00 2001 From: Andrew Brooks Date: Fri, 30 Apr 2021 18:13:16 -0500 Subject: [PATCH] bwidget: Simplify bwidget package with tcl.mkTclDerivation --- .../development/libraries/bwidget/default.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/bwidget/default.nix b/pkgs/development/libraries/bwidget/default.nix index f3f09497a660..f289077c88bb 100644 --- a/pkgs/development/libraries/bwidget/default.nix +++ b/pkgs/development/libraries/bwidget/default.nix @@ -1,8 +1,11 @@ -{ lib, stdenv, fetchurl, tcl }: +{ lib, fetchurl, tcl }: -stdenv.mkDerivation rec { - pname = "bwidget"; +let version = "1.9.14"; + libPrefix = "bwidget${version}"; +in tcl.mkTclDerivation { + pname = "bwidget"; + inherit version; src = fetchurl { url = "mirror://sourceforge/tcllib/bwidget-${version}.tar.gz"; @@ -12,16 +15,10 @@ stdenv.mkDerivation rec { dontBuild = true; installPhase = '' - mkdir -p "$out/lib/${passthru.libPrefix}" - cp -R *.tcl lang images "$out/lib/${passthru.libPrefix}" + mkdir -p "$out/lib/${libPrefix}" + cp -R *.tcl lang images "$out/lib/${libPrefix}" ''; - passthru = { - libPrefix = "bwidget${version}"; - }; - - buildInputs = [ tcl ]; - meta = { homepage = "https://sourceforge.net/projects/tcllib"; description = "High-level widget set for Tcl/Tk";