From cc96f19e0efb90fe88517003bf40280cc15b2d2c Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Sat, 31 Jul 2021 10:41:04 +0200 Subject: [PATCH] libgrss: support cross-compilation I've tested that the native output hash stays the same (with ca-derivations), so for native this should be fine. --- .../development/libraries/libgrss/default.nix | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libgrss/default.nix b/pkgs/development/libraries/libgrss/default.nix index ab8346990feb..277a1860cde5 100644 --- a/pkgs/development/libraries/libgrss/default.nix +++ b/pkgs/development/libraries/libgrss/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, vala, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome }: +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, vala, gobject-introspection, gtk-doc +, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome, buildPackages +}: stdenv.mkDerivation rec { pname = "libgrss"; @@ -20,10 +22,24 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkg-config vala gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_412 ]; - buildInputs = [ glib libxml2 libsoup ]; + nativeBuildInputs = [ + pkg-config + vala + gobject-introspection + gtk-doc + docbook_xsl + docbook_xml_dtd_412 + ]; + + buildInputs = [ + glib + libxml2 + libsoup + ]; configureFlags = [ + "PKG_CONFIG=${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config" + ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "--enable-gtk-doc" ];