diff options
| author | Moritz Heidkamp <moritz@twoticketsplease.de> | 2014-10-29 01:28:25 +0100 |
|---|---|---|
| committer | Moritz Ulrich <moritz@tarn-vedra.de> | 2014-10-29 15:17:06 +0100 |
| commit | 5f07d275f8d4bb97391cd8490f9561fac23bb740 (patch) | |
| tree | 22a24eb24925ef155e9736faa3b15ffc2b81b824 /pkgs/applications/window-managers/stumpwm | |
| parent | f73f5b9e249dc9266b5c52d5122811e8a40218d5 (diff) | |
| download | nixlib-5f07d275f8d4bb97391cd8490f9561fac23bb740.tar nixlib-5f07d275f8d4bb97391cd8490f9561fac23bb740.tar.gz nixlib-5f07d275f8d4bb97391cd8490f9561fac23bb740.tar.bz2 nixlib-5f07d275f8d4bb97391cd8490f9561fac23bb740.tar.lz nixlib-5f07d275f8d4bb97391cd8490f9561fac23bb740.tar.xz nixlib-5f07d275f8d4bb97391cd8490f9561fac23bb740.tar.zst nixlib-5f07d275f8d4bb97391cd8490f9561fac23bb740.zip | |
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.
Diffstat (limited to 'pkgs/applications/window-managers/stumpwm')
| -rw-r--r-- | pkgs/applications/window-managers/stumpwm/default.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix index 7fe28b1678a3..57f254b26b47 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; { |