git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #86294 from DamienCassou/damien/fix-i3-manpages

Fix man pages in i3-gaps

commit58ba83130c0456fbd11e1a1ed333b16821c82219 authorDamien Cassou <damien@cassou.me> dateThu 7 May 2020, 21:56 (7 years ago) parent5a15cb93793f44
2 files changed+5−10
pkgs/applications/window-managers/i3/default.nix+3−3 pkgs/applications/window-managers/i3/gaps.nix+2−7
pkgs/applications/window-managers/i3/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ fetchurl, stdenv, which, pkgconfig, makeWrapper, libxcb, xcbutilkeysyms
1+{ fetchurl, stdenv, which, pkgconfig, makeWrapper, 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 }:
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 sha256 = "0z709cianlzw0x0qwq4361347354xd9ckj1v7vjvhb1zh3x91gws";
1313 };
1414
15− nativeBuildInputs = [ which pkgconfig makeWrapper ];
15+ nativeBuildInputs = [ which pkgconfig makeWrapper installShellFiles ];
1616
1717 buildInputs = [
1818 libxcb xcbutilkeysyms xcbutil xcbutilwm xcbutilxrm libxkbcommon
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
5050 sed -i 's/which/command -v/' $program
5151 done
5252
53− install -vD -t $out/share/man/man1 man/*.{1,man}
53+ installManPage man/*.1
5454 '';
5555
5656 separateDebugInfo = true;
pkgs/applications/window-managers/i3/gaps.nix+2−7
@@ -4,19 +4,14 @@ i3.overrideAttrs (oldAttrs : rec {
44
55 name = "i3-gaps-${version}";
66 version = "4.18.1";
7− releaseDate = "2019-01-27";
87
98 src = fetchurl {
10− url = "https://github.com/Airblader/i3/archive/${version}.tar.gz";
11− sha256 = "07gk5m90v0ih7c18vcwx7p7innsccd09j2vkr99a33wk71xrww1z";
9+ url = "https://github.com/Airblader/i3/releases/download/${version}/i3-${version}.tar.bz2";
10+ sha256 = "1cxwsrdzp18r5hj0ymg9fbzp1mhkj4m9h6i0b9cdg79cjbacba9k";
1211 };
1312
1413 nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ autoreconfHook ];
1514
16− postUnpack = ''
17− echo -n "${version} (${releaseDate})" > ./i3-${version}/I3_VERSION
18− '';
19−
2015 # fatal error: GENERATED_config_enums.h: No such file or directory
2116 enableParallelBuilding = false;
2217