From 3793f44459834ac401666c606b7c0f6832bc59bd Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Wed, 29 Apr 2020 08:58:17 +0200 Subject: [PATCH] i3-gaps: Fix man pages and simplify MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The .tar.gz from the github's archive does not contain man pages, only asciidoc versions of them. Because i3-gaps uses the same build process as i3, the man pages are not generated and the asciidoc versions are put in share/man/man1. This annoys mandb: mandb: warning: …/share/man/man1/i3.man.gz: ignoring bogus filename This commit changes the downloaded file to use github's release instead. The resulting .tar.bz2 file is much closer to the one downloaded for i3 which means the build process can still be the same and we get proper man pages at the end. Because of the previous change, the I3_VERSION file is now part of the downloaded source which means Nix doesn't have to create it anymore. --- pkgs/applications/window-managers/i3/gaps.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix index b124ba0ea0c..7be037ca833 100644 --- a/pkgs/applications/window-managers/i3/gaps.nix +++ b/pkgs/applications/window-managers/i3/gaps.nix @@ -4,19 +4,14 @@ i3.overrideAttrs (oldAttrs : rec { name = "i3-gaps-${version}"; version = "4.18.1"; - releaseDate = "2019-01-27"; src = fetchurl { - url = "https://github.com/Airblader/i3/archive/${version}.tar.gz"; - sha256 = "07gk5m90v0ih7c18vcwx7p7innsccd09j2vkr99a33wk71xrww1z"; + url = "https://github.com/Airblader/i3/releases/download/${version}/i3-${version}.tar.bz2"; + sha256 = "1cxwsrdzp18r5hj0ymg9fbzp1mhkj4m9h6i0b9cdg79cjbacba9k"; }; nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ autoreconfHook ]; - postUnpack = '' - echo -n "${version} (${releaseDate})" > ./i3-${version}/I3_VERSION - ''; - # fatal error: GENERATED_config_enums.h: No such file or directory enableParallelBuilding = false;