Merge pull request #15298 from jaym/wmii-which

wmii needs which

+3 -2
+3 -2
pkgs/applications/window-managers/wmii-hg/default.nix
··· 1 - { stdenv, fetchhg, pkgconfig, libixp_hg, txt2tags, dash, python 2 , libX11 , libXrender, libXext, libXinerama, libXrandr, libXft }: 3 4 stdenv.mkDerivation rec { ··· 15 # for dlopen-ing 16 patchPhase = '' 17 substituteInPlace lib/libstuff/x11/xft.c --replace "libXft.so" "${libXft}/lib/libXft.so" 18 ''; 19 20 configurePhase = '' ··· 29 EOF 30 ''; 31 32 - buildInputs = [ pkgconfig libixp_hg txt2tags dash python 33 libX11 libXrender libXext libXinerama libXrandr libXft ]; 34 35 # For some reason including mercurial in buildInputs did not help
··· 1 + { stdenv, fetchhg, pkgconfig, libixp_hg, txt2tags, dash, python, which 2 , libX11 , libXrender, libXext, libXinerama, libXrandr, libXft }: 3 4 stdenv.mkDerivation rec { ··· 15 # for dlopen-ing 16 patchPhase = '' 17 substituteInPlace lib/libstuff/x11/xft.c --replace "libXft.so" "${libXft}/lib/libXft.so" 18 + substituteInPlace cmd/wmii.sh.sh --replace "\$(which which)" "${which}/bin/which" 19 ''; 20 21 configurePhase = '' ··· 30 EOF 31 ''; 32 33 + buildInputs = [ pkgconfig libixp_hg txt2tags dash python which 34 libX11 libXrender libXext libXinerama libXrandr libXft ]; 35 36 # For some reason including mercurial in buildInputs did not help