git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #109106 from marzzzello/i3-update

i3, i3-gaps: 4.18.3 -> 4.19

commitaa401c386f080fff795f058dd66ad41615676708 authorSandro <sandro.jaeckel@gmail.com> dateTue 12 Jan 2021, 19:16 (6 years ago) parent11a17cfaf56bbf
2 files changed+8−13
pkgs/applications/window-managers/i3/default.nix+5−5 pkgs/applications/window-managers/i3/gaps.nix+3−8
pkgs/applications/window-managers/i3/default.nix+5−5
@@ -1,18 +1,18 @@
1−{ fetchurl, lib, stdenv, which, pkgconfig, makeWrapper, installShellFiles, libxcb, xcbutilkeysyms
1+{ fetchurl, lib, stdenv, pkg-config, makeWrapper, meson, ninja, installShellFiles, libxcb, xcbutilkeysyms
22, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification, libX11, pcre, libev
33, yajl, xcb-util-cursor, perl, pango, perlPackages, libxkbcommon
44, xorgserver, xvfb_run }:
55
66stdenv.mkDerivation rec {
77 pname = "i3";
8− version = "4.18.3";
8+ version = "4.19";
99
1010 src = fetchurl {
11− url = "https://i3wm.org/downloads/${pname}-${version}.tar.bz2";
12− sha256 = "03dijnwv2n8ak9jq59fhq0rc80m5wjc9d54fslqaivnnz81pkbjk";
11+ url = "https://i3wm.org/downloads/${pname}-${version}.tar.xz";
12+ sha256 = "0wjq6lkidg0g474xsln1fhbxci7zclq3748sda10f1n7q01qp95c";
1313 };
1414
15− nativeBuildInputs = [ which pkgconfig makeWrapper installShellFiles ];
15+ nativeBuildInputs = [ pkg-config makeWrapper meson ninja installShellFiles ];
1616
1717 buildInputs = [
1818 libxcb xcbutilkeysyms xcbutil xcbutilwm xcbutilxrm libxkbcommon
pkgs/applications/window-managers/i3/gaps.nix+3−8
@@ -3,18 +3,13 @@
33i3.overrideAttrs (oldAttrs : rec {
44
55 name = "i3-gaps-${version}";
6− version = "4.18.3";
6+ version = "4.19";
77
88 src = fetchurl {
9− url = "https://github.com/Airblader/i3/releases/download/${version}/i3-${version}.tar.bz2";
10− sha256 = "1hcakwyz78lgp8mhqv7pw86jlb3m415pfql1q19rkijnhm3fn3ci";
9+ url = "https://github.com/Airblader/i3/releases/download/${version}/i3-${version}.tar.xz";
10+ sha256 = "0j19kj05fpjfnj50vyykk6jsr07hq9l26y8na55bb7yfrra8yp4h";
1111 };
1212
13− nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ autoreconfHook ];
14−
15− # fatal error: GENERATED_config_enums.h: No such file or directory
16− enableParallelBuilding = false;
17−
1813 meta = with lib; {
1914 description = "A fork of the i3 tiling window manager with some additional features";
2015 homepage = "https://github.com/Airblader/i3";