MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

dim: bump nightfall for FFmpeg >= 6 support

Browse source 
I have no idea if this works.
This commit is contained in:
Emily 2024-07-12 16:43:12 +01:00
parent fb40c82929
commit d25171fc8e
3 changed files with 80 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
pkgs/by-name/di/dim/Cargo.lock generated
View file

@ -979,7 +979,7 @@ dependencies = [
"tracing-appender",
"tracing-subscriber",
"url",
"uuid 1.5.0",
"uuid 1.10.0",
"xmlwriter",
"xtra",
"zip",
@ -1079,7 +1079,7 @@ dependencies = [
"tracing",
"tracing-appender",
"tracing-subscriber",
"uuid 1.5.0",
"uuid 1.10.0",
]
[[package]]
@ -2049,14 +2049,14 @@ dependencies = [
[[package]]
name = "nightfall"
version = "0.3.12-rc4"
source = "git+https://github.com/Dusk-Labs/nightfall?tag=0.3.12-rc4#147ea96146b4cae6f666741020cef0622a90d46c"
source = "git+https://github.com/Dusk-Labs/nightfall?rev=878f07edd5d2c71261c5ae02fe3a6db7cda18be7#878f07edd5d2c71261c5ae02fe3a6db7cda18be7"
dependencies = [
"async-trait",
"cfg-if",
"err-derive",
"lazy_static",
"mp4",
"nix 0.20.0",
"nix 0.27.1",
"ntapi",
"once_cell",
"psutil",
@ -2067,24 +2067,12 @@ dependencies = [
"tokio",
"tokio-stream",
"tracing",
"uuid 0.8.2",
"uuid 1.10.0",
"winapi",
"xtra",
"xtra_proc",
]
[[package]]
name = "nix"
version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a"
dependencies = [
"bitflags 1.3.2",
"cc",
"cfg-if",
"libc",
]
[[package]]
name = "nix"
version = "0.23.2"
@ -2098,6 +2086,17 @@ dependencies = [
"memoffset 0.6.5",
]
[[package]]
name = "nix"
version = "0.27.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
dependencies = [
"bitflags 2.4.1",
"cfg-if",
"libc",
]
[[package]]
name = "no-std-compat"
version = "0.4.1"
@ -2140,9 +2139,9 @@ dependencies = [
[[package]]
name = "ntapi"
version = "0.3.7"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f"
checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4"
dependencies = [
"winapi",
]
@ -3505,7 +3504,7 @@ dependencies = [
"tower-layer",
"tower-service",
"tracing",
"uuid 1.5.0",
"uuid 1.10.0",
]
[[package]]
@ -3747,9 +3746,9 @@ dependencies = [
[[package]]
name = "uuid"
version = "1.5.0"
version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc"
checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
dependencies = [
"getrandom",
]

48
pkgs/by-name/di/dim/bump-nightfall.patch Normal file
View file

@ -0,0 +1,48 @@
diff --git a/dim/Cargo.toml b/dim/Cargo.toml
index b7c8106493...38518ba29d 100644
--- a/dim/Cargo.toml
+++ b/dim/Cargo.toml
@@ -15,7 +15,7 @@
fdlimit = "0.2.1"
# git dependencies
-nightfall = { git = "https://github.com/Dusk-Labs/nightfall", tag = "0.3.12-rc4", default-features = false, features = [
+nightfall = { git = "https://github.com/Dusk-Labs/nightfall", rev = "878f07edd5d2c71261c5ae02fe3a6db7cda18be7", default-features = false, features = [
"cuda",
"ssa_transmux",
] }
diff --git a/dim-core/Cargo.toml b/dim-core/Cargo.toml
index b311b7c7af...ffc5d85dbb 100644
--- a/dim-core/Cargo.toml
+++ b/dim-core/Cargo.toml
@@ -11,7 +11,7 @@
[dependencies]
# git dependencies
-nightfall = { git = "https://github.com/Dusk-Labs/nightfall", tag = "0.3.12-rc4", default-features = false, features = [
+nightfall = { git = "https://github.com/Dusk-Labs/nightfall", rev = "878f07edd5d2c71261c5ae02fe3a6db7cda18be7", default-features = false, features = [
"cuda",
"ssa_transmux",
] }
@@ -72,7 +72,7 @@
"json",
] }
url = "2.2.2"
-uuid = { version = "1.2.2", features = ["v4"] }
+uuid = { version = "1.6.1", features = ["v4"] }
xmlwriter = "0.1.0"
xtra = { version = "0.5.1", features = ["tokio", "with-tokio-1"] }
diff --git a/dim-web/Cargo.toml b/dim-web/Cargo.toml
index 2da5764d50...4c7574c0b4 100644
--- a/dim-web/Cargo.toml
+++ b/dim-web/Cargo.toml
@@ -14,7 +14,7 @@
dim-events = { path = "../dim-events" }
dim-core = { path = "../dim-core" }
-nightfall = { git = "https://github.com/Dusk-Labs/nightfall", tag = "0.3.12-rc4", default-features = false, features = [
+nightfall = { git = "https://github.com/Dusk-Labs/nightfall", rev = "878f07edd5d2c71261c5ae02fe3a6db7cda18be7", default-features = false, features = [
"cuda",
"ssa_transmux",
] }

14
pkgs/by-name/di/dim/package.nix
View file

@ -6,7 +6,7 @@
buildNpmPackage,
darwin,
makeWrapper,
ffmpeg_5,
ffmpeg,
git,
pkg-config,
sqlite,
@ -48,6 +48,10 @@ rustPlatform.buildRustPackage rec {
# the working dir and PATH instead.
./relative-paths.diff
# Bump the first‐party nightfall dependency to the latest Git
# revision for FFmpeg >= 6 support.
./bump-nightfall.patch
# Upstream has some unused imports that prevent things from compiling...
# Remove for next release.
(fetchpatch {
@ -57,6 +61,10 @@ rustPlatform.buildRustPackage rec {
})
];
postPatch = ''
ln -sf ${./Cargo.lock} Cargo.lock
'';
postConfigure = ''
ln -ns $frontend ui/build
'';
@ -82,7 +90,7 @@ rustPlatform.buildRustPackage rec {
lockFile = ./Cargo.lock;
outputHashes = {
"mp4-0.8.2" = "sha256-OtVRtOTU/yoxxoRukpUghpfiEgkKoJZNflMQ3L26Cno=";
"nightfall-0.3.12-rc4" = "sha256-DtSXdIDg7XBgzEYzHdzjrHdM1ESKTQdgByeerH5TWwU=";
"nightfall-0.3.12-rc4" = "sha256-AbSuLe3ySOla3NB+mlfHRHqHuMqQbrThAaUZ747GErE=";
};
};
@ -101,7 +109,7 @@ rustPlatform.buildRustPackage rec {
postInstall = ''
wrapProgram $out/bin/dim \
--prefix PATH : ${lib.makeBinPath [ ffmpeg_5 ]}
--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}
'';
meta = {