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

Merge pull request #561 from offlinehacker/st

Browse Source 
st: Update to 0.4.1 and add support for custom config
This commit is contained in:
Peter Simons 2013-05-29 02:16:56 -07:00
commit 93d7adcba3
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 { stdenv.mkDerivation rec {
name = "st-0.3"; name = "st-0.4.1";
src = fetchurl { src = fetchurl {
url = "http://dl.suckless.org/st/${name}.tar.gz"; url = "http://dl.suckless.org/st/${name}.tar.gz";
sha256 = "0d0fjixiis4ixbz4l18rqhnssa7cy2bap3jkjyphqlqhl7lahv3d"; sha256 = "0cdzwbm5fxrwz8ryxkh90d3vwx54wjyywgj28ymsb5fdv3396bzf";
}; };
buildInputs = [ libX11 ncurses libXext libXft ]; configFile = optionalString (conf!=null) (writeText "config.def.h" conf);
preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
buildInputs = [ libX11 ncurses libXext libXft fontconfig ];
NIX_LDFLAGS = "-lfontconfig";
installPhase = '' installPhase = ''
TERMINFO=$out/share/terminfo make install PREFIX=$out TERMINFO=$out/share/terminfo make install PREFIX=$out
@ -17,7 +25,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
homepage = http://st.suckless.org/; homepage = http://st.suckless.org/;
license = "MIT"; license = "MIT";
maintainers = with stdenv.lib.maintainers; [viric]; maintainers = with maintainers; [viric];
platforms = with stdenv.lib.platforms; linux; platforms = with platforms; linux;
}; };
} }

4
pkgs/top-level/all-packages.nix
View File

@ -7927,7 +7927,9 @@ let
skype_call_recorder = callPackage ../applications/networking/instant-messengers/skype-call-recorder { }; 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;
};
sxiv = callPackage ../applications/graphics/sxiv { }; sxiv = callPackage ../applications/graphics/sxiv { };