public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Moritz Heidkamp 2014-10-29 01:28:25 +01:00 committed by Moritz Ulrich
parent f73f5b9e24
commit 5f07d275f8
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/window-managers/stumpwm/default.nix
View File

@ -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; {

5
pkgs/top-level/all-packages.nix
View File

@ -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 { };