From ec58817987e72af0b71d709497790bdf1c4815cc Mon Sep 17 00:00:00 2001 From: Mika Tammi Date: Tue, 28 Feb 2023 22:00:29 +0200 Subject: [PATCH 1/3] libglibutil: fix cross-compilation Signed-off-by: Mika Tammi --- pkgs/development/libraries/libglibutil/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/libglibutil/default.nix b/pkgs/development/libraries/libglibutil/default.nix index 730ebf270446..50ee2d289fcd 100644 --- a/pkgs/development/libraries/libglibutil/default.nix +++ b/pkgs/development/libraries/libglibutil/default.nix @@ -21,6 +21,11 @@ stdenv.mkDerivation rec { glib ]; + postPatch = '' + # Fix pkg-config name for cross-compilation + substituteInPlace Makefile --replace "pkg-config" "$PKG_CONFIG" + ''; + makeFlags = [ "LIBDIR=$(out)/lib" "INSTALL_INCLUDE_DIR=$(dev)/include/gutil" From 19c3fb47f1fb4203b4c59d85f18964619fd8709b Mon Sep 17 00:00:00 2001 From: Mika Tammi Date: Tue, 28 Feb 2023 22:17:30 +0200 Subject: [PATCH 2/3] libgbinder: fix cross-compilation Signed-off-by: Mika Tammi --- pkgs/development/libraries/libgbinder/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/libgbinder/default.nix b/pkgs/development/libraries/libgbinder/default.nix index 69166ab33feb..054dc0847051 100644 --- a/pkgs/development/libraries/libgbinder/default.nix +++ b/pkgs/development/libraries/libgbinder/default.nix @@ -22,6 +22,13 @@ stdenv.mkDerivation rec { libglibutil ]; + postPatch = '' + # Fix pkg-config and ranlib names for cross-compilation + substituteInPlace Makefile \ + --replace "pkg-config" "$PKG_CONFIG" \ + --replace "ranlib" "$RANLIB" + ''; + makeFlags = [ "LIBDIR=$(out)/lib" "INSTALL_INCLUDE_DIR=$(dev)/include/gbinder" From be31f4a47e90ffe395d20f4e060a5c0651f13246 Mon Sep 17 00:00:00 2001 From: Mika Tammi Date: Tue, 28 Feb 2023 22:34:27 +0200 Subject: [PATCH 3/3] gbinder-python: fix cross-compilation Signed-off-by: Mika Tammi --- pkgs/development/python-modules/gbinder-python/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/gbinder-python/default.nix b/pkgs/development/python-modules/gbinder-python/default.nix index e575c51e315f..9d9b906e2443 100644 --- a/pkgs/development/python-modules/gbinder-python/default.nix +++ b/pkgs/development/python-modules/gbinder-python/default.nix @@ -26,6 +26,11 @@ buildPythonPackage rec { pkg-config ]; + postPatch = '' + # Fix pkg-config name for cross-compilation + substituteInPlace setup.py --replace "pkg-config" "$PKG_CONFIG" + ''; + setupPyGlobalFlags = [ "--cython" ]; meta = with lib; {