Merge branch 'master.upstream' into staging.upstream

2015-06-26 17:25:49 -07:00
parent e130e9d3a3 8ce4cb4de8
commit ef253212f4
53 changed files with 673 additions and 200 deletions
@@ -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 = ''