From c1daf6eab8bdceb6eaeae843acc5c31cb71cdc75 Mon Sep 17 00:00:00 2001 From: Thibaut Marty Date: Thu, 9 Apr 2020 23:18:58 +0200 Subject: [PATCH 1/5] 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 --- .../window-managers/herbstluftwm/default.nix | 42 ++++++++++++------- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 31 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix index 8c4f6e452f46..47f91c525402 100644 --- a/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -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 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f89c825d630..96ad8eb5bed7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; From 74274b4d7c99a15859c0f89651d8d5cf4783de14 Mon Sep 17 00:00:00 2001 From: Thibaut Marty Date: Fri, 10 Apr 2020 11:56:37 +0200 Subject: [PATCH 2/5] herbstluftwm: fix cross compilation Doc generation is disabled by default when cross compiling because asciidoc does not cross compile for now --- .../window-managers/herbstluftwm/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix index 47f91c525402..0c23db007776 100644 --- a/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -1,4 +1,10 @@ -{ stdenv, fetchurl, cmake, pkgconfig, glib, libX11, libXext, libXinerama, libXrandr, asciidoc }: +{ stdenv, fetchurl, cmake, pkgconfig, glib, libX11, libXext, libXinerama, libXrandr +, withDoc ? stdenv.buildPlatform == stdenv.targetPlatform, asciidoc ? null }: + +# Doc generation is disabled by default when cross compiling because asciidoc +# does not cross compile for now + +assert withDoc -> asciidoc != null; stdenv.mkDerivation rec { pname = "herbstluftwm"; @@ -11,19 +17,19 @@ stdenv.mkDerivation rec { outputs = [ "out" + ] ++ stdenv.lib.optionals withDoc [ "doc" "man" ]; cmakeFlags = [ "-DCMAKE_INSTALL_SYSCONF_PREFIX=${placeholder "out"}/etc" - ]; + ] ++ stdenv.lib.optional (!withDoc) "-DWITH_DOCUMENTATION=OFF"; nativeBuildInputs = [ cmake pkgconfig - asciidoc - ]; + ] ++ stdenv.lib.optional withDoc asciidoc; buildInputs = [ glib From 8fb54e7168d30c69406425aa4e30beb7f4495616 Mon Sep 17 00:00:00 2001 From: Thibaut Marty Date: Fri, 10 Apr 2020 12:54:45 +0200 Subject: [PATCH 3/5] herbstluftwm: add option to the X Window System manual chapter --- nixos/doc/manual/configuration/x-windows.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml index 06dd7c8bfb94..110712baf5f1 100644 --- a/nixos/doc/manual/configuration/x-windows.xml +++ b/nixos/doc/manual/configuration/x-windows.xml @@ -31,6 +31,7 @@ = true; = true; = true; + = true; From a6b06e1431ee24bf823849fa3df0d9e8f79604e4 Mon Sep 17 00:00:00 2001 From: Thibaut Marty Date: Tue, 21 Apr 2020 12:11:09 +0200 Subject: [PATCH 4/5] herbstluftwm: 0.7.2 -> 0.8.1 Bash completions is now installed in $out/share/bash-completion. Setting CMAKE_INSTALL_SYSCONF_PREFIX is still needed for /etc/xdg/herbstluftwm installation. --- pkgs/applications/window-managers/herbstluftwm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix index 0c23db007776..9ef7ab24e5e5 100644 --- a/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -8,11 +8,11 @@ assert withDoc -> asciidoc != null; stdenv.mkDerivation rec { pname = "herbstluftwm"; - version = "0.8.0"; + version = "0.8.1"; src = fetchurl { url = "https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz"; - sha256 = "04n8cmrgb490kfn70x9kgxp286mrrn7nb4irhi7nvbm6lv0z28sq"; + sha256 = "0c1lf82z6a56g8asin91cmqhzk3anw0xwc44b31bpjixadmns57y"; }; outputs = [ From 2af9e07c08504304e56df2b3a8852b3dc4d6bd62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 1 May 2020 23:44:15 +0100 Subject: [PATCH 5/5] herbstluftwm: remove glib no longer required, since it's C++ now. --- pkgs/applications/window-managers/herbstluftwm/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix index 9ef7ab24e5e5..47541a3fdb57 100644 --- a/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -32,7 +32,6 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional withDoc asciidoc; buildInputs = [ - glib libX11 libXext libXinerama