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

Merge master into stdenv-updates

Browse Source 
Conflicts:
	pkgs/development/lisp-modules/stumpwm/default.nix (auto-solved)
	pkgs/top-level/all-packages.nix (trivial)
This commit is contained in:
Vladimír Čunát
2014-01-12 12:27:06 +01:00
parent 51713fbbfc a0070a9157
commit a2c316288c
281 changed files with 3039 additions and 2058 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/lisp-modules/stumpwm/default.nix
View File

@@ -19,14 +19,17 @@ buildLispPackage rec {
${x.deployConfigScript}
export CL_SOURCE_REGISTRY="$CL_SOURCE_REGISTRY:$PWD/"
./autogen.sh
configureFlags=" --with-lisp=$NIX_LISP --with-$NIX_LISP=$(which common-lisp.sh) "
configureFlags=" --with-lisp=$NIX_LISP --with-$NIX_LISP=$(which common-lisp.sh) --with-contrib-dir=$out/lib/common-lisp/stumpwm/contrib/"
'';
installPhase=x.installPhase + ''
installPhase = with pkgs; x.installPhase + ''
make install
if [ "$NIX_LISP" = "sbcl" ]; then
wrapProgram "$out"/bin/stumpwm --set SBCL_HOME "${clwrapper.lisp}/lib/sbcl"
fi;
mv $out/lib/common-lisp/stumpwm/contrib/stumpish $out/bin/stumpish
wrapProgram "$out"/bin/stumpish --prefix PATH : "${xlibs.xprop}/bin:${coreutils}/bin:${gnugrep}/bin:${gnused}/bin:${rlwrap}/bin:${ncurses}/bin"
'';
postInstall = ''false'';
};