i3, i3-gaps: 4.18.3 -> 4.19

Upstream switched from the autotools build system to the meson build system.
Also the source archive format switched from tar.bz2 to tar.xz
The build now supports application documentation in /share/doc/i3/
https://i3wm.org/downloads/RELEASE-NOTES-4.19.txt
This commit is contained in:
marzzzello 2021-01-12 10:59:13 +01:00
parent 5cbe85dbd8
commit af56bbf6ac
2 changed files with 8 additions and 13 deletions

View file

@ -1,18 +1,18 @@
{ fetchurl, lib, stdenv, which, pkgconfig, makeWrapper, installShellFiles, libxcb, xcbutilkeysyms
{ fetchurl, lib, stdenv, pkg-config, makeWrapper, meson, ninja, installShellFiles, libxcb, xcbutilkeysyms
, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification, libX11, pcre, libev
, yajl, xcb-util-cursor, perl, pango, perlPackages, libxkbcommon
, xorgserver, xvfb_run }:
stdenv.mkDerivation rec {
pname = "i3";
version = "4.18.3";
version = "4.19";
src = fetchurl {
url = "https://i3wm.org/downloads/${pname}-${version}.tar.bz2";
sha256 = "03dijnwv2n8ak9jq59fhq0rc80m5wjc9d54fslqaivnnz81pkbjk";
url = "https://i3wm.org/downloads/${pname}-${version}.tar.xz";
sha256 = "0wjq6lkidg0g474xsln1fhbxci7zclq3748sda10f1n7q01qp95c";
};
nativeBuildInputs = [ which pkgconfig makeWrapper installShellFiles ];
nativeBuildInputs = [ pkg-config makeWrapper meson ninja installShellFiles ];
buildInputs = [
libxcb xcbutilkeysyms xcbutil xcbutilwm xcbutilxrm libxkbcommon

View file

@ -3,18 +3,13 @@
i3.overrideAttrs (oldAttrs : rec {
name = "i3-gaps-${version}";
version = "4.18.3";
version = "4.19";
src = fetchurl {
url = "https://github.com/Airblader/i3/releases/download/${version}/i3-${version}.tar.bz2";
sha256 = "1hcakwyz78lgp8mhqv7pw86jlb3m415pfql1q19rkijnhm3fn3ci";
url = "https://github.com/Airblader/i3/releases/download/${version}/i3-${version}.tar.xz";
sha256 = "0j19kj05fpjfnj50vyykk6jsr07hq9l26y8na55bb7yfrra8yp4h";
};
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ autoreconfHook ];
# fatal error: GENERATED_config_enums.h: No such file or directory
enableParallelBuilding = false;
meta = with lib; {
description = "A fork of the i3 tiling window manager with some additional features";
homepage = "https://github.com/Airblader/i3";