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

Merge pull request #109106 from marzzzello/i3-update

Browse Source 
i3, i3-gaps: 4.18.3 -> 4.19
This commit is contained in:
Sandro 2021-01-12 19:16:30 +01:00 committed by GitHub
commit aa401c386f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/window-managers/i3/default.nix
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

11
pkgs/applications/window-managers/i3/gaps.nix
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";