From 0453c58e9acf42c4ba52f3fda21d7e51139c0141 Mon Sep 17 00:00:00 2001 From: Colin Date: Wed, 27 Aug 2025 16:40:22 +0000 Subject: [PATCH] newsflash: fix cross compilation --- pkgs/by-name/ne/newsflash/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/ne/newsflash/package.nix b/pkgs/by-name/ne/newsflash/package.nix index ff6f21e03ab9..ec206d87410c 100644 --- a/pkgs/by-name/ne/newsflash/package.nix +++ b/pkgs/by-name/ne/newsflash/package.nix @@ -44,6 +44,9 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs build-aux/cargo.sh meson rewrite kwargs set project / version '${finalAttrs.version}' + substituteInPlace src/meson.build --replace-fail \ + "'src' / rust_target / 'news_flash_gtk'" \ + "'src' / '${stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target / 'news_flash_gtk'" ''; strictDeps = true; @@ -88,6 +91,9 @@ stdenv.mkDerivation (finalAttrs: { gst-plugins-bad ]); + # For https://gitlab.com/news-flash/news_flash_gtk/-/blob/8e5fc4acf5ca6be5b8cd616466a17e7a273f9dda/src/meson.build#L47 + env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec; + passthru.updateScript = gitUpdater { rev-prefix = "v."; ignoredVersions = "(alpha|beta|rc)";