Skip to content

[staging-next] gst_all_1.gst-plugins-rs: add temporary fix for cargo-c test issue #239681

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vcunat merged 1 commit into from
Jun 26, 2023
Merged

[staging-next] gst_all_1.gst-plugins-rs: add temporary fix for cargo-c test issue #239681

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion pkgs/development/libraries/gstreamer/rs/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitLab
, fetchpatch
, writeText
, rustPlatform
, meson
Expand Down Expand Up @@ -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}";
Expand Down Expand Up @@ -165,7 +177,7 @@ stdenv.mkDerivation rec {
pkg-config
rustc
cargo
cargo-c
cargo-c'
nasm
] ++ lib.optionals enableDocumentation [
hotdoc
Expand Down