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

Merge pull request #15298 from jaym/wmii-which 

wmii needs which
This commit is contained in:
Joachim Fasting 2016-05-08 02:38:46 +02:00
parent ecf9fa4cbe bc6f922eb9
commit 11df7acf3e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/window-managers/wmii-hg/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchhg, pkgconfig, libixp_hg, txt2tags, dash, python { stdenv, fetchhg, pkgconfig, libixp_hg, txt2tags, dash, python, which
, libX11 , libXrender, libXext, libXinerama, libXrandr, libXft }: , libX11 , libXrender, libXext, libXinerama, libXrandr, libXft }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
# for dlopen-ing # for dlopen-ing
patchPhase = '' patchPhase = ''
substituteInPlace lib/libstuff/x11/xft.c --replace "libXft.so" "${libXft}/lib/libXft.so" substituteInPlace lib/libstuff/x11/xft.c --replace "libXft.so" "${libXft}/lib/libXft.so"
substituteInPlace cmd/wmii.sh.sh --replace "\$(which which)" "${which}/bin/which"
''; '';
configurePhase = '' configurePhase = ''
@ -29,7 +30,7 @@ stdenv.mkDerivation rec {
EOF EOF
''; '';
buildInputs = [ pkgconfig libixp_hg txt2tags dash python buildInputs = [ pkgconfig libixp_hg txt2tags dash python which
libX11 libXrender libXext libXinerama libXrandr libXft ]; libX11 libXrender libXext libXinerama libXrandr libXft ];
# For some reason including mercurial in buildInputs did not help # For some reason including mercurial in buildInputs did not help