From 884a83cacb6907063e827ad589a68bb622c84394 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 24 Feb 2021 10:31:18 +0000 Subject: [PATCH 1/2] glib: fix cross-compiling --- pkgs/development/libraries/glib/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 0e8ed605a2d6..abf880c19944 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -92,6 +92,7 @@ stdenv.mkDerivation rec { buildInputs = [ libelf setupHook pcre bash gnum4 # install glib-gettextize and m4 macros for other apps to use + gtk-doc ] ++ optionals stdenv.isLinux [ libselinux util-linuxMinimal # for libmount @@ -99,8 +100,10 @@ stdenv.mkDerivation rec { AppKit Carbon Cocoa CoreFoundation CoreServices Foundation ]); + strictDeps = true; + nativeBuildInputs = [ - meson ninja pkg-config perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45 + meson ninja pkg-config perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45 libxml2 ]; propagatedBuildInputs = [ zlib libffi gettext libiconv ]; @@ -144,7 +147,7 @@ stdenv.mkDerivation rec { cp -r ${buildPackages.glib.devdoc} $devdoc ''; - checkInputs = [ tzdata libxml2 desktop-file-utils shared-mime-info ]; + checkInputs = [ tzdata desktop-file-utils shared-mime-info ]; preCheck = optionalString doCheck '' export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${pname}-${version}/glib/.libs''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" From 74e0aaaa30c1751450cddf055a5eb4ca64d7e33b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 24 Feb 2021 10:49:35 +0000 Subject: [PATCH 2/2] glib: fix musl build --- pkgs/development/libraries/glib/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index abf880c19944..b18ce099dced 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -123,6 +123,8 @@ stdenv.mkDerivation rec { "-DG_DISABLE_CAST_CHECKS" ]; + hardeningDisable = [ "pie" ]; + postPatch = '' chmod +x gio/tests/gengiotypefuncs.py patchShebangs gio/tests/gengiotypefuncs.py