herbstluftwm: 0.7.2 -> 0.8.0

Build now relies on cmake.
Added outputs "doc" and "man".
Setting CMAKE_INSTALL_SYSCONF_PREFIX is needed for bash completion
directory, otherwise it tries to put files in /etc/bash_completion.d
This commit is contained in:
Thibaut Marty 2020-04-09 23:18:58 +02:00
parent 0995d779a3
commit c1daf6eab8
2 changed files with 31 additions and 15 deletions

View file

@ -1,27 +1,41 @@
{ stdenv, fetchurl, pkgconfig, glib, libX11, libXext, libXinerama }:
{ stdenv, fetchurl, cmake, pkgconfig, glib, libX11, libXext, libXinerama, libXrandr, asciidoc }:
stdenv.mkDerivation rec {
name = "herbstluftwm-0.7.2";
pname = "herbstluftwm";
version = "0.8.0";
src = fetchurl {
url = "https://herbstluftwm.org/tarballs/${name}.tar.gz";
sha256 = "1kc18aj9j3nfz6fj4qxg9s3gg4jvn6kzi3ii24hfm0vqdpy17xnz";
url = "https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz";
sha256 = "04n8cmrgb490kfn70x9kgxp286mrrn7nb4irhi7nvbm6lv0z28sq";
};
patchPhase = ''
substituteInPlace config.mk \
--replace "/usr/local" "$out" \
--replace "/etc" "$out/etc" \
--replace "/zsh/functions/Completion/X" "/zsh/site-functions" \
--replace "/usr/share" "\$(PREFIX)/share"
'';
outputs = [
"out"
"doc"
"man"
];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glib libX11 libXext libXinerama ];
cmakeFlags = [
"-DCMAKE_INSTALL_SYSCONF_PREFIX=${placeholder "out"}/etc"
];
nativeBuildInputs = [
cmake
pkgconfig
asciidoc
];
buildInputs = [
glib
libX11
libXext
libXinerama
libXrandr
];
meta = {
description = "A manual tiling window manager for X";
homepage = "http://herbstluftwm.org/";
homepage = "https://herbstluftwm.org/";
license = stdenv.lib.licenses.bsd2;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ the-kenny ];

View file

@ -19786,7 +19786,9 @@ in
heme = callPackage ../applications/editors/heme { };
herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { };
herbstluftwm = callPackage ../applications/window-managers/herbstluftwm {
asciidoc = asciidoc-full;
};
hercules = callPackage ../applications/virtualization/hercules { };