nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-18 18:14:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #239083 from lilyinstarlight/upd/gst-plugins-rs-0.10.9

Browse Source
This commit is contained in:
Sandro 2023-07-05 14:12:43 +02:00 committed by GitHub
commit c5cc90543c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3078 additions and 561 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3594
pkgs/development/libraries/gstreamer/rs/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

45
pkgs/development/libraries/gstreamer/rs/default.nix
View File

@ -32,9 +32,6 @@
# Checks meson.is_cross_build(), so even canExecute isn't enough.
, enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform && plugins == null
, hotdoc
# TODO: required for case-insensitivity hack below
, yq
, moreutils
}:
let
@ -99,6 +96,8 @@ let
[
"csound" # tests have weird failure on x86, does not currently work on arm or darwin
"livesync" # tests have suspicious intermittent failure, see https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/357
] ++ lib.optionals stdenv.isAarch64 [
"raptorq" # pointer alignment failure in tests on aarch64
] ++ lib.optionals stdenv.isDarwin [
"reqwest" # tests hang on darwin
"threadshare" # tests cannot bind to localhost on darwin
@ -119,8 +118,9 @@ let
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=";
url = "https://github.com/lu-zero/cargo-c/commit/8421f2da07cd066d2ae8afbb027760f76dc9ee6c.diff";
hash = "sha256-eZSR4DKSbS5HPpb9Kw8mM2ZWg7Y92gZQcaXUEu1WNj0=";
revert = true;
})
];
});
@ -130,7 +130,7 @@ in
stdenv.mkDerivation rec {
pname = "gst-plugins-rs";
version = "0.10.8";
version = "0.10.9";
outputs = [ "out" "dev" ];
@ -139,30 +139,37 @@ stdenv.mkDerivation rec {
owner = "gstreamer";
repo = "gst-plugins-rs";
rev = version;
hash = "sha256-UxmfyqbQwkQjwHiARRpFJiGsrsNjv6V129lIHPk7gRk=";
hash = "sha256-pUvcPazg6/SsD7sqML2tb+ZVWDqO1MRIcj3CQioePZY=";
# TODO: temporary workaround for case-insensitivity problems with color-name crate - https://github.com/annymosse/color-name/pull/2
nativeBuildInputs = [ yq moreutils ];
postFetch = ''
tomlq --toml-output '.package |= map(if .name == "color-name"
then (.source = "git+https://github.com/lilyinstarlight/color-name#cac0ed5b7d2e0682c08c9bfd13089d5494e81b9a" | del(.checksum))
else .
end)' $out/Cargo.lock | sponge $out/Cargo.lock
sedSearch="$(cat <<\EOF | sed -ze 's/\n/\\n/g'
\[\[package\]\]
name = "color-name"
version = "\([^"\n]*\)"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "[^"\n]*"
EOF
)"
sedReplace="$(cat <<\EOF | sed -ze 's/\n/\\n/g'
[[package]]
name = "color-name"
version = "\1"
source = "git+https://github.com/lilyinstarlight/color-name#cac0ed5b7d2e0682c08c9bfd13089d5494e81b9a"
EOF
)"
sed -i -ze "s|$sedSearch|$sedReplace|g" $out/Cargo.lock
'';
};
postPatch = ''
rm net/raptorq/tests/raptorq.rs
'';
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
outputHashes = {
"cairo-rs-0.17.10" = "sha256-5lWlDHlMco380tRaxyApdNv5DDKJL9QrKI2DvHM3868=";
"cairo-rs-0.17.10" = "sha256-g7d1ccSbGIPVMu73mb5QvWVSN8XAB1xLZuWfgdd1cfU=";
"color-name-1.1.0" = "sha256-RfMStbe2wX5qjPARHIFHlSDKjzx8DwJ+RjzyltM5K7A=";
"ffv1-0.0.0" = "sha256-af2VD00tMf/hkfvrtGrHTjVJqbl+VVpLaR0Ry+2niJE=";
"flavors-0.2.0" = "sha256-zBa0X75lXnASDBam9Kk6w7K7xuH9fP6rmjWZBUB5hxk=";
"gdk4-0.6.6" = "sha256-TI4F9MjIpxFEZItoewP/Zem1vM4MsKNJTzfgah1vjmI=";
"gstreamer-0.20.6" = "sha256-IyzqCQ5oQt5QgFp6liGyDaFhteCceR1KPzJCE4R6zus=";
"gdk4-0.6.6" = "sha256-1WPXxsZJoYEQxVuP/CSpGs2XEZSJD//JJz4Ka2hxXHM=";
"gstreamer-0.20.6" = "sha256-nG+4nak0l1j29S5rddrMu38lfFq12Bjw16uaj61QiQs=";
};
};