From 42e6f4ca71f594937a2dc15a93e733fd9ee5a41e Mon Sep 17 00:00:00 2001 From: Lily Foster Date: Mon, 26 Jun 2023 07:33:44 -0400 Subject: [PATCH] gst_all_1.gst-plugins-rs: add temporary fix for cargo-c test issue --- .../development/libraries/gstreamer/rs/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gstreamer/rs/default.nix b/pkgs/development/libraries/gstreamer/rs/default.nix index d41852835e70..ef366a87061f 100644 --- a/pkgs/development/libraries/gstreamer/rs/default.nix +++ b/pkgs/development/libraries/gstreamer/rs/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitLab +, fetchpatch , writeText , rustPlatform , meson @@ -112,6 +113,17 @@ let ) (lib.attrNames validPlugins); invalidPlugins = lib.subtractLists (lib.attrNames validPlugins) selectedPlugins; + + # TODO: figure out what must be done about this upstream - related lu-zero/cargo-c#323 lu-zero/cargo-c#138 + cargo-c' = cargo-c.overrideAttrs (oldAttrs: { + patches = (oldAttrs.patches or []) ++ [ + (fetchpatch { + name = "cargo-c-test-rlib-fix.patch"; + url = "https://github.com/lu-zero/cargo-c/commit/596c582deed419b0cf1f80b9be77ff705df20e01.diff"; + hash = "sha256-GETjZwYqX7h51rxWznAg5Ojozdp1SOYnUh+iuRGA4/w="; + }) + ]; + }); in assert lib.assertMsg (invalidPlugins == []) "Invalid gst-plugins-rs plugin${lib.optionalString (lib.length invalidPlugins > 1) "s"}: ${lib.concatStringsSep ", " invalidPlugins}"; @@ -165,7 +177,7 @@ stdenv.mkDerivation rec { pkg-config rustc cargo - cargo-c + cargo-c' nasm ] ++ lib.optionals enableDocumentation [ hotdoc