diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-10-03 11:16:46 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-03 11:16:46 +0100 |
commit | 3e953d6980f00e7e1a0ea47905f8dae9a39bfae5 (patch) | |
tree | 456de45e889353f0fecd8db3b4effca28dce4642 /pkgs/applications | |
parent | 1200117b5c3d7cc2ebdd547da83a9f6ef98643b0 (diff) | |
parent | 63ff7bd008617336b84235e62a072516f08dfafc (diff) | |
download | nixlib-3e953d6980f00e7e1a0ea47905f8dae9a39bfae5.tar nixlib-3e953d6980f00e7e1a0ea47905f8dae9a39bfae5.tar.gz nixlib-3e953d6980f00e7e1a0ea47905f8dae9a39bfae5.tar.bz2 nixlib-3e953d6980f00e7e1a0ea47905f8dae9a39bfae5.tar.lz nixlib-3e953d6980f00e7e1a0ea47905f8dae9a39bfae5.tar.xz nixlib-3e953d6980f00e7e1a0ea47905f8dae9a39bfae5.tar.zst nixlib-3e953d6980f00e7e1a0ea47905f8dae9a39bfae5.zip |
Merge pull request #47724 from xeji/p/st
st: remove unused build inputs, drop wrapper
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/misc/st/default.nix | 9 |
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 = { |