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

st: remove unused build inputs, drop wrapper

Browse Source 
- remove unused buildInputs
- ncurses belongs in nativeBuildInputs (tic to compile terminfo)
- drop dmenu wrapper, st doesn't use dmenu at all
This commit is contained in:
Uli Baum 2018-10-03 10:42:59 +02:00
parent a88b8da554
commit 63ff7bd008
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/misc/st/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, writeText, makeWrapper, libX11, ncurses, libXext { stdenv, fetchurl, pkgconfig, writeText, libX11, ncurses
, libXft, fontconfig, dmenu, conf ? null, patches ? [], extraLibs ? []}: , libXft, conf ? null, patches ? [], extraLibs ? []}:
with stdenv.lib; with stdenv.lib;
@ -16,12 +16,11 @@ 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 makeWrapper ]; nativeBuildInputs = [ pkgconfig ncurses ];
buildInputs = [ libX11 ncurses libXext libXft fontconfig ] ++ extraLibs; buildInputs = [ libX11 libXft ] ++ 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 = {