From 235e33eb07ac270e119f514bbf8f55bed83c24ce Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 24 Sep 2023 12:19:37 -0300 Subject: [PATCH] pekwm: rewrite - strictDeps - split output - meta.mainProgram --- .../window-managers/pekwm/default.nix | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/window-managers/pekwm/default.nix b/pkgs/applications/window-managers/pekwm/default.nix index dcd2bb27a71d..b6baed455925 100644 --- a/pkgs/applications/window-managers/pekwm/default.nix +++ b/pkgs/applications/window-managers/pekwm/default.nix @@ -2,10 +2,8 @@ , stdenv , fetchFromGitHub , awk -, grep -, sed -, runtimeShell , cmake +, grep , libXext , libXft , libXinerama @@ -14,6 +12,8 @@ , libjpeg , libpng , pkg-config +, runtimeShell +, sed }: stdenv.mkDerivation (finalAttrs: { @@ -32,13 +32,6 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - cmakeFlags = [ - "-DAWK=${awk}/bin/awk" - "-DGREP=${grep}/bin/grep" - "-DSED=${sed}/bin/sed" - "-DSH=${runtimeShell}" - ]; - buildInputs = [ libXext libXft @@ -49,6 +42,17 @@ stdenv.mkDerivation (finalAttrs: { libpng ]; + outputs = [ "out" "man" ]; + + strictDeps = true; + + cmakeFlags = [ + "-DAWK=${lib.getBin awk}/bin/awk" + "-DGREP=${lib.getBin grep}/bin/grep" + "-DSED=${lib.getBin sed}/bin/sed" + "-DSH=${runtimeShell}" + ]; + meta = { homepage = "https://www.pekwm.se/"; description = "A lightweight window manager"; @@ -67,6 +71,7 @@ stdenv.mkDerivation (finalAttrs: { ''; changelog = "https://raw.githubusercontent.com/pekwm/pekwm/release-${finalAttrs.version}/NEWS.md"; license = lib.licenses.gpl2Plus; + mainProgram = "pekwm"; maintainers = [ lib.maintainers.AndersonTorres ]; platforms = lib.platforms.linux; };