Merge pull request #37492 from geistesk/st-dmenu

st: add dmenu dependency
This commit is contained in:
lewo 2018-03-22 12:43:06 +01:00 committed by GitHub
commit 3dc8d5cb4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, writeText, libX11, ncurses, libXext, libXft { stdenv, fetchurl, pkgconfig, writeText, makeWrapper, libX11, ncurses, libXext
, fontconfig, conf ? null, patches ? [], extraLibs ? []}: , libXft, fontconfig, dmenu, conf ? null, patches ? [], extraLibs ? []}:
with stdenv.lib; with stdenv.lib;
@ -17,11 +17,12 @@ in stdenv.mkDerivation rec {
configFile = optionalString (conf!=null) (writeText "config.def.h" conf); configFile = optionalString (conf!=null) (writeText "config.def.h" conf);
preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig makeWrapper ];
buildInputs = [ libX11 ncurses libXext libXft fontconfig ] ++ extraLibs; buildInputs = [ libX11 ncurses libXext libXft fontconfig ] ++ extraLibs;
installPhase = '' installPhase = ''
TERMINFO=$out/share/terminfo make install PREFIX=$out TERMINFO=$out/share/terminfo make install PREFIX=$out
wrapProgram "$out/bin/st" --prefix PATH : "${dmenu}/bin"
''; '';
meta = { meta = {