summary refs log tree commit diff
path: root/pkgs/applications/window-managers
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2015-06-26 17:25:49 -0700
committerWilliam A. Kennington III <william@wkennington.com>2015-06-26 17:25:49 -0700
commitef253212f4978eee85751c43f39adaf22a141d43 (patch)
tree6227478d1f264dec8a8562c3d2fbffac409e9dd2 /pkgs/applications/window-managers
parente130e9d3a3225622194b4edbd9073547d6acb984 (diff)
parent8ce4cb4de81fd2b79d8e99e74be4e4a1c481f030 (diff)
downloadnixpkgs-ef253212f4978eee85751c43f39adaf22a141d43.tar
nixpkgs-ef253212f4978eee85751c43f39adaf22a141d43.tar.gz
nixpkgs-ef253212f4978eee85751c43f39adaf22a141d43.tar.bz2
nixpkgs-ef253212f4978eee85751c43f39adaf22a141d43.tar.lz
nixpkgs-ef253212f4978eee85751c43f39adaf22a141d43.tar.xz
nixpkgs-ef253212f4978eee85751c43f39adaf22a141d43.tar.zst
nixpkgs-ef253212f4978eee85751c43f39adaf22a141d43.zip
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/applications/window-managers')
-rw-r--r--pkgs/applications/window-managers/stumpwm/default.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix
index d44ac128d80..88faae64be7 100644
--- a/pkgs/applications/window-managers/stumpwm/default.nix
+++ b/pkgs/applications/window-managers/stumpwm/default.nix
@@ -41,6 +41,8 @@ stdenv.mkDerivation rec {
 
   preBuild = ''
     cp -r --no-preserve=mode ${contrib} modules
+    substituteInPlace  head.lisp \
+      --replace 'run-shell-command "xdpyinfo' 'run-shell-command "${xdpyinfo}/bin/xdpyinfo'
   '';
 
   installPhase = ''