1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 21:50:55 +00:00

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
commit 11df7acf3e

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 }:
stdenv.mkDerivation rec {
@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
# for dlopen-ing
patchPhase = ''
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 = ''
@ -29,7 +30,7 @@ stdenv.mkDerivation rec {
EOF
'';
buildInputs = [ pkgconfig libixp_hg txt2tags dash python
buildInputs = [ pkgconfig libixp_hg txt2tags dash python which
libX11 libXrender libXext libXinerama libXrandr libXft ];
# For some reason including mercurial in buildInputs did not help