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

Merge pull request #20300 from mayflower/pkg/i3-4.13

Browse Source 
i3: 4.12 -> 4.13
This commit is contained in:
Tim Steinbach 2016-11-09 21:06:32 -05:00 committed by GitHub
commit dc02c7c53f
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/applications/window-managers/i3/default.nix
View File

@ -1,25 +1,31 @@
{ fetchurl, stdenv, which, pkgconfig, makeWrapper, libxcb, xcbutilkeysyms { fetchurl, stdenv, which, pkgconfig, makeWrapper, libxcb, xcbutilkeysyms
, xcbutil, xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl , xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification, libX11, pcre, libev
, xcb-util-cursor, coreutils, perl, pango, perlPackages, libxkbcommon , yajl, xcb-util-cursor, coreutils, perl, pango, perlPackages, libxkbcommon
, xorgserver, xvfb_run, dmenu, i3status }: , xorgserver, xvfb_run, dmenu, i3status }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "i3-${version}"; name = "i3-${version}";
version = "4.12"; version = "4.13";
src = fetchurl { src = fetchurl {
url = "http://i3wm.org/downloads/${name}.tar.bz2"; url = "http://i3wm.org/downloads/${name}.tar.bz2";
sha256 = "1d3q3lgpjbkmcwzjhp0dfr0jq847silcfg087slcnj95ikh1r7p1"; sha256 = "12ngz32swh9n85xy0cz1lq16aqi9ys5hq19v589q9a97wn1k3hcl";
}; };
nativeBuildInputs = [ which pkgconfig makeWrapper ];
buildInputs = [ buildInputs = [
which pkgconfig makeWrapper libxcb xcbutilkeysyms xcbutil xcbutilwm libxkbcommon libxcb xcbutilkeysyms xcbutil xcbutilwm xcbutilxrm libxkbcommon
libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango
perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun
perlPackages.ExtUtilsPkgConfig perlPackages.TestMore perlPackages.InlineC perlPackages.ExtUtilsPkgConfig perlPackages.TestMore perlPackages.InlineC
xorgserver xvfb_run xorgserver xvfb_run
]; ];
configureFlags = [ "--disable-builddir" ];
enableParallelBuilding = true;
postPatch = '' postPatch = ''
patchShebangs . patchShebangs .
''; '';
@ -45,12 +51,8 @@ stdenv.mkDerivation rec {
! grep -q '^not ok' testcases/latest/complete-run.log ! grep -q '^not ok' testcases/latest/complete-run.log
''; '';
configurePhase = "makeFlags=PREFIX=$out";
postInstall = '' postInstall = ''
wrapProgram "$out/bin/i3-save-tree" --prefix PERL5LIB ":" "$PERL5LIB" wrapProgram "$out/bin/i3-save-tree" --prefix PERL5LIB ":" "$PERL5LIB"
mkdir -p $out/man/man1
cp man/*.1 $out/man/man1
for program in $out/bin/i3-sensible-*; do for program in $out/bin/i3-sensible-*; do
sed -i 's/which/command -v/' $program sed -i 's/which/command -v/' $program
done done
@ -59,7 +61,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A tiling window manager"; description = "A tiling window manager";
homepage = "http://i3wm.org"; homepage = "http://i3wm.org";
maintainers = with maintainers; [ garbas modulistic ]; maintainers = with maintainers; [ garbas modulistic fpletz ];
license = licenses.bsd3; license = licenses.bsd3;
platforms = platforms.all; platforms = platforms.all;