From 8deddc21331bb86cf45d6f22afd8f54733d6d603 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Wed, 28 Jul 2021 23:27:45 +0200 Subject: [PATCH] yabar: support cross-compilation, format --- .../window-managers/yabar/build.nix | 25 ++++++++++++++++--- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/yabar/build.nix b/pkgs/applications/window-managers/yabar/build.nix index f9b5d227b0e..207e3a83ab2 100644 --- a/pkgs/applications/window-managers/yabar/build.nix +++ b/pkgs/applications/window-managers/yabar/build.nix @@ -19,16 +19,33 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkg-config ]; + strictDeps = true; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ + pkg-config + asciidoc + docbook_xsl + libxslt + makeWrapper + libconfig + pango + ]; buildInputs = [ - cairo gdk-pixbuf libconfig pango xcbutilwm docbook_xsl - alsa-lib wirelesstools asciidoc libxslt makeWrapper + cairo + gdk-pixbuf + libconfig + pango + xcbutilwm + alsa-lib + wirelesstools ]; postPatch = '' substituteInPlace ./Makefile \ --replace "\$(shell git describe)" "${version}" \ - --replace "a2x" "${asciidoc}/bin/a2x --no-xmllint" + --replace "a2x" "a2x --no-xmllint" ''; makeFlags = [ "DESTDIR=$(out)" "PREFIX=/" ];