From 5f07d275f8d4bb97391cd8490f9561fac23bb740 Mon Sep 17 00:00:00 2001 From: Moritz Heidkamp Date: Wed, 29 Oct 2014 01:28:25 +0100 Subject: [PATCH] Remove stumpwmContrib from top-level and fix runtime dependency on it This patch removes the stumpwmContrib package from the top-level since it can't sensibly be used on its own. Also, it wraps the stumpwm executable with a dummy reference to the contrib dir to work around the issue that the stumpwm executable doesn't reference the contrib dir that's passed in the configure phase for some reason. --- pkgs/applications/window-managers/stumpwm/default.nix | 6 +++++- pkgs/top-level/all-packages.nix | 5 +++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix index 7fe28b1678a..57f254b26b4 100644 --- a/pkgs/applications/window-managers/stumpwm/default.nix +++ b/pkgs/applications/window-managers/stumpwm/default.nix @@ -23,12 +23,16 @@ stdenv.mkDerivation rec { ''; configurePhase = '' - ./configure --prefix=$out --with-contrib-dir=${pkgs.stumpwmContrib}/contrib + ./configure --prefix=$out --with-contrib-dir=${stumpwmContrib}/contrib ''; installPhase = '' make make install + # STUMPWM_CONTRIB_DIR is not actually used. We just set it so that + # stumpwmContrib gets retained as a runtime dependency because for + # some reason $out/bin/stumpwm does not contain a reference to it. + wrapProgram $out/bin/stumpwm --set STUMPWM_CONTRIB_DIR "${stumpwmContrib}/contrib" ''; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e57107484a..e1154b5b167 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10458,8 +10458,9 @@ let stp = callPackage ../applications/science/logic/stp {}; - stumpwm = callPackage ../applications/window-managers/stumpwm {}; - stumpwmContrib = callPackage ../applications/window-managers/stumpwm/contrib.nix {}; + stumpwm = callPackage ../applications/window-managers/stumpwm { + stumpwmContrib = callPackage ../applications/window-managers/stumpwm/contrib.nix { }; + }; sublime = callPackage ../applications/editors/sublime { };