dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #114566 from ThibautMarty/herbstluftwm-0.9.2

Browse Source 
herbstluftwm: 0.9.1 -> 0.9.2
This commit is contained in:
Sandro 2021-02-27 23:50:47 +01:00 committed by GitHub
commit 7ce72686a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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
, nixosTests }:
# Doc generation is disabled by default when cross compiling because asciidoc
# dependency is broken when cross compiling for now
let
cross = stdenv.buildPlatform != stdenv.targetPlatform;
in stdenv.mkDerivation rec {
stdenv.mkDerivation rec {
pname = "herbstluftwm";
version = "0.9.1";
version = "0.9.2";
src = fetchurl {
url = "https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz";
sha256 = "0r4qaklv97qcq8p0pnz4f2zqg69vfai6c2qi1ydi2kz24xqjf5hy";
sha256 = "0avfhr68f6fjnafjdcyxcx7dkg38f2nadmhpj971qyqzfq2f6i38";
};
outputs = [
"out"
"doc" # share/doc exists with examples even without generated html documentation
] ++ lib.optionals (!cross) [
"doc"
"man"
];
cmakeFlags = [
"-DCMAKE_INSTALL_SYSCONF_PREFIX=${placeholder "out"}/etc"
] ++ lib.optional cross "-DWITH_DOCUMENTATION=OFF";
];
nativeBuildInputs = [
cmake
pkg-config
python3
] ++ lib.optional (!cross) asciidoc;
];
depsBuildBuild = [
asciidoc-full
];
buildInputs = [
libX11
libXext
libXinerama
libXrandr
libXft
freetype
];
patches = [
@ -75,6 +73,9 @@ in stdenv.mkDerivation rec {
'';
pytestFlagsArray = [ "../tests" ];
disabledTests = [
"test_title_different_letters_are_drawn"
];
passthru = {
tests.herbstluftwm = nixosTests.herbstluftwm;

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

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