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

tabbed: 20150509 -> 20160425

Browse Source 
Xft is now bundled. Hence removing that option
This commit is contained in:
Rahul Gopinath 2016-06-29 12:25:50 -07:00
parent 473f864a1f
commit 37b5928a81
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/window-managers/tabbed/default.nix
View File

@ -3,21 +3,19 @@
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "tabbed-20150509"; name = "tabbed-20160425";
src = fetchgit { src = fetchgit {
url = http://git.suckless.org/tabbed; url = http://git.suckless.org/tabbed;
rev = "55dc32b27b73c121cab18009bf087e95ef3d9c18"; rev = "bc236142fa72d2f9d6b5c790d3f3a9a9168a7164";
sha256 = "0c5ayf1lrb1xiz5h8dfd4mh05kas42zzi5m5ylrvl67sfz3z4wg1"; sha256 = "1fiv57g3jnlhnb6zrzl3n6lnpn2s9s0sd7bcv7r1nb3grwy7icri";
}; };
patches = optional enableXft ./xft.patch;
postPatch = stdenv.lib.optionalString (customConfig != null) '' postPatch = stdenv.lib.optionalString (customConfig != null) ''
cp ${builtins.toFile "config.h" customConfig} ./config.h cp ${builtins.toFile "config.h" customConfig} ./config.h
''; '';
buildInputs = [ xproto libX11 ] ++ optional enableXft libXft; buildInputs = [ xproto libX11 libXft ];
preInstall = '' preInstall = ''
export makeFlags="PREFIX=$out" export makeFlags="PREFIX=$out"

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

@ -14383,7 +14383,6 @@ in
synergy = callPackage ../applications/misc/synergy { }; synergy = callPackage ../applications/misc/synergy { };
tabbed = callPackage ../applications/window-managers/tabbed { tabbed = callPackage ../applications/window-managers/tabbed {
enableXft = true;
# if you prefer a custom config, write the config.h in tabbed.config.h # if you prefer a custom config, write the config.h in tabbed.config.h
# and enable # and enable
# customConfig = builtins.readFile ./tabbed.config.h; # customConfig = builtins.readFile ./tabbed.config.h;