about summary refs log tree commit diff
path: root/pkgs/applications/misc/st
diff options
context:
space:
mode:
authorUli Baum <xeji@cat3.de>2018-10-03 10:42:59 +0200
committerUli Baum <xeji@cat3.de>2018-10-03 10:42:59 +0200
commit63ff7bd008617336b84235e62a072516f08dfafc (patch)
tree441888013a9415a8524e7ac4792385b0ded64835 /pkgs/applications/misc/st
parenta88b8da55436e4d74ff5fa50c5c20308966a34cb (diff)
downloadnixlib-63ff7bd008617336b84235e62a072516f08dfafc.tar
nixlib-63ff7bd008617336b84235e62a072516f08dfafc.tar.gz
nixlib-63ff7bd008617336b84235e62a072516f08dfafc.tar.bz2
nixlib-63ff7bd008617336b84235e62a072516f08dfafc.tar.lz
nixlib-63ff7bd008617336b84235e62a072516f08dfafc.tar.xz
nixlib-63ff7bd008617336b84235e62a072516f08dfafc.tar.zst
nixlib-63ff7bd008617336b84235e62a072516f08dfafc.zip
st: remove unused build inputs, drop wrapper
- remove unused buildInputs
- ncurses belongs in nativeBuildInputs (tic to compile terminfo)
- drop dmenu wrapper, st doesn't use dmenu at all
Diffstat (limited to 'pkgs/applications/misc/st')
-rw-r--r--pkgs/applications/misc/st/default.nix9
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix
index efaf986a9e54..f8340b1bd227 100644
--- a/pkgs/applications/misc/st/default.nix
+++ b/pkgs/applications/misc/st/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, writeText, makeWrapper, libX11, ncurses, libXext
-, libXft, fontconfig, dmenu, conf ? null, patches ? [], extraLibs ? []}:
+{ stdenv, fetchurl, pkgconfig, writeText, libX11, ncurses
+, libXft, conf ? null, patches ? [], extraLibs ? []}:
 
 with stdenv.lib;
 
@@ -16,12 +16,11 @@ stdenv.mkDerivation rec {
   configFile = optionalString (conf!=null) (writeText "config.def.h" conf);
   preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
 
-  nativeBuildInputs = [ pkgconfig makeWrapper ];
-  buildInputs = [ libX11 ncurses libXext libXft fontconfig ] ++ extraLibs;
+  nativeBuildInputs = [ pkgconfig ncurses ];
+  buildInputs = [ libX11 libXft ] ++ extraLibs;
 
   installPhase = ''
     TERMINFO=$out/share/terminfo make install PREFIX=$out
-    wrapProgram "$out/bin/st" --prefix PATH : "${dmenu}/bin"
   '';
 
   meta = {