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

herbstluftwm: 0.9.1 -> 0.9.2

Browse Source 
This release introduces window titles and now depends on freetype and
libXft. The test `test_title_different_letters_are_drawn` is disabled
for now because it is broken, probably because of font issue in the
build sandbox.

I also fixed the build of the documentation when cross-compiling.
This commit is contained in:
Thibaut Marty 2021-02-27 15:44:24 +01:00
parent 74b9241e60
commit 93c2d520a5
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pkgs/applications/window-managers/herbstluftwm/default.nix
View File

@ -1,44 +1,42 @@
{ lib, stdenv, fetchurl, cmake, pkg-config, python3, libX11, libXext, libXinerama, libXrandr, asciidoc { lib, stdenv, fetchurl, cmake, pkg-config, python3, libX11, libXext, libXinerama, libXrandr, libXft, freetype, asciidoc-full
, xdotool, xorgserver, xsetroot, xterm, runtimeShell , xdotool, xorgserver, xsetroot, xterm, runtimeShell
, nixosTests }: , nixosTests }:
# Doc generation is disabled by default when cross compiling because asciidoc stdenv.mkDerivation rec {
# dependency is broken when cross compiling for now
let
cross = stdenv.buildPlatform != stdenv.targetPlatform;
in stdenv.mkDerivation rec {
pname = "herbstluftwm"; pname = "herbstluftwm";
version = "0.9.1"; version = "0.9.2";
src = fetchurl { src = fetchurl {
url = "https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz"; url = "https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz";
sha256 = "0r4qaklv97qcq8p0pnz4f2zqg69vfai6c2qi1ydi2kz24xqjf5hy"; sha256 = "0avfhr68f6fjnafjdcyxcx7dkg38f2nadmhpj971qyqzfq2f6i38";
}; };
outputs = [ outputs = [
"out" "out"
"doc" # share/doc exists with examples even without generated html documentation "doc"
] ++ lib.optionals (!cross) [
"man" "man"
]; ];
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_INSTALL_SYSCONF_PREFIX=${placeholder "out"}/etc" "-DCMAKE_INSTALL_SYSCONF_PREFIX=${placeholder "out"}/etc"
] ++ lib.optional cross "-DWITH_DOCUMENTATION=OFF"; ];
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
pkg-config pkg-config
python3 ];
] ++ lib.optional (!cross) asciidoc;
depsBuildBuild = [
asciidoc-full
];
buildInputs = [ buildInputs = [
libX11 libX11
libXext libXext
libXinerama libXinerama
libXrandr libXrandr
libXft
freetype
]; ];
patches = [ patches = [
@ -75,6 +73,9 @@ in stdenv.mkDerivation rec {
''; '';
pytestFlagsArray = [ "../tests" ]; pytestFlagsArray = [ "../tests" ];
disabledTests = [
"test_title_different_letters_are_drawn"
];
passthru = { passthru = {
tests.herbstluftwm = nixosTests.herbstluftwm; tests.herbstluftwm = nixosTests.herbstluftwm;

4
pkgs/top-level/all-packages.nix
View File

@ -22800,9 +22800,7 @@ in
herbe = callPackage ../applications/misc/herbe { }; herbe = callPackage ../applications/misc/herbe { };
herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { };
asciidoc = asciidoc-full;
};
hercules = callPackage ../applications/virtualization/hercules { }; hercules = callPackage ../applications/virtualization/hercules { };