From 37b5928a81b60df6380b256c86c7223b4d9849ec Mon Sep 17 00:00:00 2001 From: Rahul Gopinath Date: Wed, 29 Jun 2016 12:25:50 -0700 Subject: tabbed: 20150509 -> 20160425 Xft is now bundled. Hence removing that option --- pkgs/applications/window-managers/tabbed/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'pkgs/applications/window-managers') diff --git a/pkgs/applications/window-managers/tabbed/default.nix b/pkgs/applications/window-managers/tabbed/default.nix index 6fefb2191585f..80c2a5705a754 100644 --- a/pkgs/applications/window-managers/tabbed/default.nix +++ b/pkgs/applications/window-managers/tabbed/default.nix @@ -3,21 +3,19 @@ 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; - postPatch = stdenv.lib.optionalString (customConfig != null) '' cp ${builtins.toFile "config.h" customConfig} ./config.h ''; - buildInputs = [ xproto libX11 ] ++ optional enableXft libXft; + buildInputs = [ xproto libX11 libXft ]; preInstall = '' export makeFlags="PREFIX=$out" -- cgit 1.4.1