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

Merge pull request #16606 from vrthra/tabbed

Browse Source 
tabbed :  20150509 -> 20160425
This commit is contained in:
Arseniy Seroka 2016-06-30 23:03:09 +04:00 committed by GitHub
commit 29bf0796a7
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,29 +1,33 @@
{stdenv, fetchgit, xproto, libX11, enableXft, libXft}: {stdenv, fetchgit, xproto, libX11, libXft, customConfig ? null, patches ? [] }:
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; inherit patches;
buildInputs = [ xproto libX11 ] ++ optional enableXft libXft; postPatch = stdenv.lib.optionalString (customConfig != null) ''
cp ${builtins.toFile "config.h" customConfig} ./config.h
preInstall = ''
export makeFlags="PREFIX=$out"
''; '';
buildInputs = [ xproto libX11 libXft ];
makeFlags = [
"PREFIX=$(out)"
];
meta = { meta = {
homepage = http://tools.suckless.org/tabbed; homepage = http://tools.suckless.org/tabbed;
description = "Simple generic tabbed fronted to xembed aware applications"; description = "Simple generic tabbed fronted to xembed aware applications";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ viric ]; maintainers = with maintainers; [ viric vrthra ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

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

@ -14383,7 +14383,9 @@ 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
# and enable
# customConfig = builtins.readFile ./tabbed.config.h;
}; };
taffybar = callPackage ../applications/window-managers/taffybar { taffybar = callPackage ../applications/window-managers/taffybar {