st: Update to 0.4.1 and add support for custom config
This commit is contained in:
parent
5e4a456e6f
commit
431fc8b250
@ -1,14 +1,22 @@
|
||||
{ stdenv, fetchurl, libX11, ncurses, libXext, libXft }:
|
||||
{ stdenv, fetchurl, writeText, libX11, ncurses, libXext, libXft, fontconfig
|
||||
, conf? null}:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "st-0.3";
|
||||
name = "st-0.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dl.suckless.org/st/${name}.tar.gz";
|
||||
sha256 = "0d0fjixiis4ixbz4l18rqhnssa7cy2bap3jkjyphqlqhl7lahv3d";
|
||||
sha256 = "0cdzwbm5fxrwz8ryxkh90d3vwx54wjyywgj28ymsb5fdv3396bzf";
|
||||
};
|
||||
|
||||
configFile = optionalString (conf!=null) (writeText "config.def.h" conf);
|
||||
preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
|
||||
|
||||
buildInputs = [ libX11 ncurses libXext libXft ];
|
||||
buildInputs = [ libX11 ncurses libXext libXft fontconfig ];
|
||||
|
||||
NIX_LDFLAGS = "-lfontconfig";
|
||||
|
||||
installPhase = ''
|
||||
TERMINFO=$out/share/terminfo make install PREFIX=$out
|
||||
@ -17,7 +25,7 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
homepage = http://st.suckless.org/;
|
||||
license = "MIT";
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
maintainers = with maintainers; [viric];
|
||||
platforms = with platforms; linux;
|
||||
};
|
||||
}
|
||||
|
@ -7853,7 +7853,9 @@ let
|
||||
|
||||
skype_call_recorder = callPackage ../applications/networking/instant-messengers/skype-call-recorder { };
|
||||
|
||||
st = callPackage ../applications/misc/st { };
|
||||
st = callPackage ../applications/misc/st {
|
||||
conf = config.st.conf or null;
|
||||
};
|
||||
|
||||
bittorrentSync = callPackage ../applications/networking/bittorrentsync { };
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user