From f0283774caf011a78ee73459ee590b1e030a42f5 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 8 Jan 2025 12:32:19 +0100 Subject: [PATCH] onboard: fix cross build --- pkgs/by-name/on/onboard/package.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/on/onboard/package.nix b/pkgs/by-name/on/onboard/package.nix index 1db2da7e1d48..14f0cc15882f 100644 --- a/pkgs/by-name/on/onboard/package.nix +++ b/pkgs/by-name/on/onboard/package.nix @@ -1,6 +1,7 @@ { fetchurl, fetchpatch, + stdenv, lib, substituteAll, aspellWithDicts, @@ -79,6 +80,7 @@ python3.pkgs.buildPythonApplication rec { intltool pkg-config wrapGAppsHook3 + python3.pkgs.setuptools ]; buildInputs = [ @@ -140,9 +142,10 @@ python3.pkgs.buildPythonApplication rec { chmod -x ./scripts/sokSettings.py - patchShebangs . + patchShebangs --host Onboard/ onboard-settings onboard substituteInPlace setup.py \ + --replace-fail "pkg-config" "${stdenv.cc.targetPrefix}pkg-config" \ --replace "/etc" "$out/etc" substituteInPlace ./Onboard/LanguageSupport.py \ @@ -177,10 +180,13 @@ python3.pkgs.buildPythonApplication rec { # setuptools to get distutils with python 3.12 installPhase = '' - ${(python3.withPackages (p: [ p.setuptools ])).interpreter} setup.py install --prefix="$out" - + runHook preInstall + ${ + (python3.pythonOnBuildForHost.withPackages (p: [ p.setuptools ])).interpreter + } setup.py install --prefix="$out" cp onboard-default-settings.gschema.override.example $out/share/glib-2.0/schemas/10_onboard-default-settings.gschema.override glib-compile-schemas $out/share/glib-2.0/schemas/ + runHook postInstall ''; # Remove ubuntu icons.