From c52e0a11107196974858aaaaf617a50744054896 Mon Sep 17 00:00:00 2001 From: Colin Date: Sat, 23 May 2026 23:24:46 +0000 Subject: [PATCH 1/2] libglycin{,-gtk4}: fix cross compilation --- pkgs/by-name/li/libglycin-gtk4/package.nix | 5 +++++ pkgs/by-name/li/libglycin/package.nix | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/pkgs/by-name/li/libglycin-gtk4/package.nix b/pkgs/by-name/li/libglycin-gtk4/package.nix index a7c2b7901ec1..74f5c269aed1 100644 --- a/pkgs/by-name/li/libglycin-gtk4/package.nix +++ b/pkgs/by-name/li/libglycin-gtk4/package.nix @@ -79,6 +79,9 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs \ build-aux/crates-version.py + substituteInPlace libglycin/meson.build --replace-fail \ + "cargo_output = cargo_target_dir / rust_target" \ + "cargo_output = cargo_target_dir / '${stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target" ''; postFixup = '' @@ -86,6 +89,8 @@ stdenv.mkDerivation (finalAttrs: { moveToOutput "share/doc" "$devdoc" ''; + env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec; + meta = { description = "C-Bindings to convert glycin frames to GDK Textures"; homepage = "https://gitlab.gnome.org/GNOME/glycin"; diff --git a/pkgs/by-name/li/libglycin/package.nix b/pkgs/by-name/li/libglycin/package.nix index b2eeab914a7f..23c14d269da7 100644 --- a/pkgs/by-name/li/libglycin/package.nix +++ b/pkgs/by-name/li/libglycin/package.nix @@ -94,6 +94,9 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs \ build-aux/crates-version.py + substituteInPlace libglycin/meson.build --replace-fail \ + "cargo_output = cargo_target_dir / rust_target" \ + "cargo_output = cargo_target_dir / '${stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target" ''; postFixup = '' @@ -101,6 +104,8 @@ stdenv.mkDerivation (finalAttrs: { moveToOutput "share/doc" "$devdoc" ''; + env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec; + passthru = { updateScript = let From b0eee67a21128b8ff9e392cc7d27ec941d8db4f1 Mon Sep 17 00:00:00 2001 From: Colin Date: Sat, 23 May 2026 23:39:19 +0000 Subject: [PATCH 2/2] libglycin{,-gtk4}: enable strictDeps --- pkgs/by-name/li/libglycin-gtk4/package.nix | 2 ++ pkgs/by-name/li/libglycin/package.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/pkgs/by-name/li/libglycin-gtk4/package.nix b/pkgs/by-name/li/libglycin-gtk4/package.nix index 74f5c269aed1..f5b46f1d68b3 100644 --- a/pkgs/by-name/li/libglycin-gtk4/package.nix +++ b/pkgs/by-name/li/libglycin-gtk4/package.nix @@ -91,6 +91,8 @@ stdenv.mkDerivation (finalAttrs: { env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec; + strictDeps = true; + meta = { description = "C-Bindings to convert glycin frames to GDK Textures"; homepage = "https://gitlab.gnome.org/GNOME/glycin"; diff --git a/pkgs/by-name/li/libglycin/package.nix b/pkgs/by-name/li/libglycin/package.nix index 23c14d269da7..9ee9bb5df921 100644 --- a/pkgs/by-name/li/libglycin/package.nix +++ b/pkgs/by-name/li/libglycin/package.nix @@ -106,6 +106,8 @@ stdenv.mkDerivation (finalAttrs: { env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec; + strictDeps = true; + passthru = { updateScript = let