From 4fc6b7b77a2ec00475816e39f7ad2782a39049b7 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 19 Aug 2025 03:56:18 +0300 Subject: [PATCH] glycin-loaders: Fix cross The hook adds the necessary cargo config --- pkgs/by-name/gl/glycin-loaders/package.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/by-name/gl/glycin-loaders/package.nix b/pkgs/by-name/gl/glycin-loaders/package.nix index 06bc12716d63..a3588b6628a9 100644 --- a/pkgs/by-name/gl/glycin-loaders/package.nix +++ b/pkgs/by-name/gl/glycin-loaders/package.nix @@ -20,6 +20,7 @@ ninja, pkg-config, rustc, + rustPlatform, }: stdenv.mkDerivation (finalAttrs: { @@ -39,6 +40,8 @@ stdenv.mkDerivation (finalAttrs: { finalAttrs.passthru.glycinPathsPatch ]; + cargoVendorDir = "vendor"; + nativeBuildInputs = [ cargo gettext # for msgfmt @@ -47,6 +50,7 @@ stdenv.mkDerivation (finalAttrs: { ninja pkg-config rustc + rustPlatform.cargoSetupHook ]; buildInputs = [ @@ -68,6 +72,13 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; + postPatch = '' + substituteInPlace loaders/meson.build \ + --replace-fail "cargo_target_dir / rust_target / loader," "cargo_target_dir / '${stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target / loader," + ''; + + env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec; + passthru = { updateScript = gnome.updateScript { attrPath = "glycin-loaders";