diff options
author | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2016-06-30 23:03:09 +0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-30 23:03:09 +0400 |
commit | 29bf0796a70d41efc6915057f08ae241a5c6a520 (patch) | |
tree | b8af62279123730f4188b8a56ae7f0d5e99e202f /pkgs/applications | |
parent | cdf6cdcb908f3dcb15034e705ab75b0af1091fa4 (diff) | |
parent | 2c44e0410c716f174011fae8718d1328f2fa6a66 (diff) | |
download | nixlib-29bf0796a70d41efc6915057f08ae241a5c6a520.tar nixlib-29bf0796a70d41efc6915057f08ae241a5c6a520.tar.gz nixlib-29bf0796a70d41efc6915057f08ae241a5c6a520.tar.bz2 nixlib-29bf0796a70d41efc6915057f08ae241a5c6a520.tar.lz nixlib-29bf0796a70d41efc6915057f08ae241a5c6a520.tar.xz nixlib-29bf0796a70d41efc6915057f08ae241a5c6a520.tar.zst nixlib-29bf0796a70d41efc6915057f08ae241a5c6a520.zip |
Merge pull request #16606 from vrthra/tabbed
tabbed : 20150509 -> 20160425
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/window-managers/tabbed/default.nix | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/pkgs/applications/window-managers/tabbed/default.nix b/pkgs/applications/window-managers/tabbed/default.nix index 68c72a20e673..279ba68eae8b 100644 --- a/pkgs/applications/window-managers/tabbed/default.nix +++ b/pkgs/applications/window-managers/tabbed/default.nix @@ -1,29 +1,33 @@ -{stdenv, fetchgit, xproto, libX11, enableXft, libXft}: +{stdenv, fetchgit, xproto, libX11, libXft, customConfig ? null, patches ? [] }: with stdenv.lib; stdenv.mkDerivation rec { - name = "tabbed-20150509"; + name = "tabbed-20160425"; src = fetchgit { url = http://git.suckless.org/tabbed; - rev = "55dc32b27b73c121cab18009bf087e95ef3d9c18"; - sha256 = "0c5ayf1lrb1xiz5h8dfd4mh05kas42zzi5m5ylrvl67sfz3z4wg1"; + rev = "bc236142fa72d2f9d6b5c790d3f3a9a9168a7164"; + sha256 = "1fiv57g3jnlhnb6zrzl3n6lnpn2s9s0sd7bcv7r1nb3grwy7icri"; }; - patches = optional enableXft ./xft.patch; + inherit patches; - buildInputs = [ xproto libX11 ] ++ optional enableXft libXft; - - preInstall = '' - export makeFlags="PREFIX=$out" + postPatch = stdenv.lib.optionalString (customConfig != null) '' + cp ${builtins.toFile "config.h" customConfig} ./config.h ''; + buildInputs = [ xproto libX11 libXft ]; + + makeFlags = [ + "PREFIX=$(out)" + ]; + meta = { homepage = http://tools.suckless.org/tabbed; description = "Simple generic tabbed fronted to xembed aware applications"; license = licenses.mit; - maintainers = with maintainers; [ viric ]; + maintainers = with maintainers; [ viric vrthra ]; platforms = platforms.linux; }; } |