diff options
| author | lewo <lewo@abesis.fr> | 2018-03-22 12:43:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-22 12:43:06 +0100 |
| commit | 3dc8d5cb4ba90577a5cd0fa76086cd46423c93de (patch) | |
| tree | 8664b2933c05b1eb882df83bd3d478cf5886d23c /pkgs | |
| parent | b30595d10dd3cd840ffc75b250eb16c8c1610ae3 (diff) | |
| parent | 31914502cb4b6657f1509abd7dfdfd503f4645d3 (diff) | |
| download | nixpkgs-3dc8d5cb4ba90577a5cd0fa76086cd46423c93de.tar nixpkgs-3dc8d5cb4ba90577a5cd0fa76086cd46423c93de.tar.gz nixpkgs-3dc8d5cb4ba90577a5cd0fa76086cd46423c93de.tar.bz2 nixpkgs-3dc8d5cb4ba90577a5cd0fa76086cd46423c93de.tar.lz nixpkgs-3dc8d5cb4ba90577a5cd0fa76086cd46423c93de.tar.xz nixpkgs-3dc8d5cb4ba90577a5cd0fa76086cd46423c93de.tar.zst nixpkgs-3dc8d5cb4ba90577a5cd0fa76086cd46423c93de.zip | |
Merge pull request #37492 from geistesk/st-dmenu
st: add dmenu dependency
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/misc/st/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix index 825a37faf1e..c7512a8ac27 100644 --- a/pkgs/applications/misc/st/default.nix +++ b/pkgs/applications/misc/st/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, writeText, libX11, ncurses, libXext, libXft -, fontconfig, conf ? null, patches ? [], extraLibs ? []}: +{ stdenv, fetchurl, pkgconfig, writeText, makeWrapper, libX11, ncurses, libXext +, libXft, fontconfig, dmenu, conf ? null, patches ? [], extraLibs ? []}: with stdenv.lib; @@ -17,11 +17,12 @@ in stdenv.mkDerivation rec { configFile = optionalString (conf!=null) (writeText "config.def.h" conf); preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ libX11 ncurses libXext libXft fontconfig ] ++ extraLibs; installPhase = '' TERMINFO=$out/share/terminfo make install PREFIX=$out + wrapProgram "$out/bin/st" --prefix PATH : "${dmenu}/bin" ''; meta = { |