From 1cdcf6731912e19ab940aa6e8967ca54f57ca7aa Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 18 Oct 2023 18:36:44 -0300 Subject: [PATCH] windowmaker.dockapps.libdockapp: refactor --- .../wi/windowmaker/dockapps/libdockapp.nix | 32 +++++++++++-------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/wi/windowmaker/dockapps/libdockapp.nix b/pkgs/by-name/wi/windowmaker/dockapps/libdockapp.nix index aaf99ec932e6..12446bfc7262 100644 --- a/pkgs/by-name/wi/windowmaker/dockapps/libdockapp.nix +++ b/pkgs/by-name/wi/windowmaker/dockapps/libdockapp.nix @@ -1,30 +1,36 @@ -{ lib, stdenv, dockapps-sources, autoreconfHook, pkg-config -, libX11, libXext, libXpm, mkfontdir, fontutil }: +{ lib +, stdenv +, autoreconfHook +, dockapps-sources +, fontutil +, libX11 +, libXext +, libXpm +, mkfontdir +, pkg-config +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libdockapp"; - version = "0.7.3"; - src = dockapps-sources; + inherit (dockapps-sources) version src; + + sourceRoot = "${finalAttrs.src.name}/libdockapp"; nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libX11 libXext libXpm fontutil mkfontdir ]; - setSourceRoot = '' - export sourceRoot=$(echo */${pname}) - ''; - # There is a bug on --with-font configureFlags = [ "--with-examples=no" "--with-font=no" ]; - meta = with lib; { + meta = { description = "A library providing a framework for dockapps"; homepage = "https://www.dockapps.net/libdockapp"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.bstrik ]; + license = lib.licenses.gpl2Plus; + maintainers = [ ]; }; -} +})