diff options
| author | Jaka Hudoklin <jakahudoklin@gmail.com> | 2013-05-10 14:31:13 +0000 |
|---|---|---|
| committer | Jaka Hudoklin <jakahudoklin@gmail.com> | 2013-05-26 12:18:45 +0000 |
| commit | 431fc8b250335f8bed09605c998a458e9ddbf0e9 (patch) | |
| tree | 0c5581badec8b19a8bdfd0b29da76d67153fda9e /pkgs | |
| parent | 5e4a456e6f004251b19f0dfca302f5030ea82394 (diff) | |
| download | nixlib-431fc8b250335f8bed09605c998a458e9ddbf0e9.tar nixlib-431fc8b250335f8bed09605c998a458e9ddbf0e9.tar.gz nixlib-431fc8b250335f8bed09605c998a458e9ddbf0e9.tar.bz2 nixlib-431fc8b250335f8bed09605c998a458e9ddbf0e9.tar.lz nixlib-431fc8b250335f8bed09605c998a458e9ddbf0e9.tar.xz nixlib-431fc8b250335f8bed09605c998a458e9ddbf0e9.tar.zst nixlib-431fc8b250335f8bed09605c998a458e9ddbf0e9.zip | |
st: Update to 0.4.1 and add support for custom config
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/misc/st/default.nix | 20 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 17 insertions, 7 deletions
diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix index 70089759626f..41575ce35a69 100644 --- a/pkgs/applications/misc/st/default.nix +++ b/pkgs/applications/misc/st/default.nix @@ -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; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd173c744867..cb5bffa91262 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |