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

Merge pull request #397 from modulistic/master

Browse Source 
i3 improvements
This commit is contained in:
viric 2013-03-20 13:52:32 -07:00
commit 9dc4ec57a1
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,21 +1,20 @@
{ fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutil, { fetchurl, stdenv, which, pkgconfig, libxcb, xcbutilkeysyms, xcbutil,
xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl, xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl,
libXcursor, coreutils, perl }: libXcursor, coreutils, perl, pango }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "i3-${version}"; name = "i3-${version}";
version = "4.5"; version = "4.5.1";
src = fetchurl { src = fetchurl {
url = "http://i3wm.org/downloads/${name}.tar.bz2"; url = "http://i3wm.org/downloads/${name}.tar.bz2";
sha256 = "1kiffcbvvjljqchw9ffgy9s8f9z06i8805jvjas58q5i2yxl5kcy"; sha256 = "bae55f1c7c4a21d71aae182e4fab6038ba65ba4be5d1ceff9e269f4f74b823f2";
}; };
buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutil xcbutilwm buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutil xcbutilwm
libstartup_notification libX11 pcre libev yajl libXcursor perl ]; libstartup_notification libX11 pcre libev yajl libXcursor perl pango ];
patchPhase = '' patchPhase = ''
sed -i -e '/^# Pango/,/^$/d' common.mk
patchShebangs . patchShebangs .
''; '';

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

@ -7224,7 +7224,9 @@ let
hydrogen = callPackage ../applications/audio/hydrogen { }; hydrogen = callPackage ../applications/audio/hydrogen { };
i3 = callPackage ../applications/window-managers/i3 { }; i3 = callPackage ../applications/window-managers/i3 {
cairo = cairo.override { xcbSupport = true; };
};
i3lock = callPackage ../applications/window-managers/i3/lock.nix { i3lock = callPackage ../applications/window-managers/i3/lock.nix {
cairo = cairo.override { xcbSupport = true; }; cairo = cairo.override { xcbSupport = true; };