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

Merge pull request #86294 from DamienCassou/damien/fix-i3-manpages

Browse Source 
Fix man pages in i3-gaps
This commit is contained in:
Damien Cassou 2020-05-07 21:56:15 +02:00 committed by GitHub
commit 58ba83130c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/window-managers/i3/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, which, pkgconfig, makeWrapper, libxcb, xcbutilkeysyms { fetchurl, stdenv, which, pkgconfig, makeWrapper, installShellFiles, libxcb, xcbutilkeysyms
, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification, libX11, pcre, libev , xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification, libX11, pcre, libev
, yajl, xcb-util-cursor, perl, pango, perlPackages, libxkbcommon , yajl, xcb-util-cursor, perl, pango, perlPackages, libxkbcommon
, xorgserver, xvfb_run }: , xorgserver, xvfb_run }:
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "0z709cianlzw0x0qwq4361347354xd9ckj1v7vjvhb1zh3x91gws"; sha256 = "0z709cianlzw0x0qwq4361347354xd9ckj1v7vjvhb1zh3x91gws";
}; };
nativeBuildInputs = [ which pkgconfig makeWrapper ]; nativeBuildInputs = [ which pkgconfig makeWrapper installShellFiles ];
buildInputs = [ buildInputs = [
libxcb xcbutilkeysyms xcbutil xcbutilwm xcbutilxrm libxkbcommon libxcb xcbutilkeysyms xcbutil xcbutilwm xcbutilxrm libxkbcommon
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
sed -i 's/which/command -v/' $program sed -i 's/which/command -v/' $program
done done
install -vD -t $out/share/man/man1 man/*.{1,man} installManPage man/*.1
''; '';
separateDebugInfo = true; separateDebugInfo = true;

9
pkgs/applications/window-managers/i3/gaps.nix
View File

@ -4,19 +4,14 @@ i3.overrideAttrs (oldAttrs : rec {
name = "i3-gaps-${version}"; name = "i3-gaps-${version}";
version = "4.18.1"; version = "4.18.1";
releaseDate = "2019-01-27";
src = fetchurl { src = fetchurl {
url = "https://github.com/Airblader/i3/archive/${version}.tar.gz"; url = "https://github.com/Airblader/i3/releases/download/${version}/i3-${version}.tar.bz2";
sha256 = "07gk5m90v0ih7c18vcwx7p7innsccd09j2vkr99a33wk71xrww1z"; sha256 = "1cxwsrdzp18r5hj0ymg9fbzp1mhkj4m9h6i0b9cdg79cjbacba9k";
}; };
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ autoreconfHook ]; nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ autoreconfHook ];
postUnpack = ''
echo -n "${version} (${releaseDate})" > ./i3-${version}/I3_VERSION
'';
# fatal error: GENERATED_config_enums.h: No such file or directory # fatal error: GENERATED_config_enums.h: No such file or directory
enableParallelBuilding = false; enableParallelBuilding = false;