nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 23:13:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

rustplayer: unstable-2022-12-04 -> 1.1.2-unstable-2024-07-14

Browse Source 
Includes fixes for FFmpeg 6. This is another `ffmpeg-sys-next` fork
situation that is going to be a pain when we bump to 7.
This commit is contained in:
Emily 2024-07-14 12:16:23 +01:00
parent b2b7066b25
commit e1c2ff514c
3 changed files with 762 additions and 600 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1346
pkgs/by-name/ru/rustplayer/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

4
pkgs/by-name/ru/rustplayer/dynamic-lib.patch
View File

@ -6,8 +6,8 @@ index 9db9ac9..4546253 100644
rodio_source = ['rodio']
[dependencies]
-ffmpeg-sys-next = { git="https://github.com/Kingtous/rust-ffmpeg-sys.git", branch="fix/4.4.0", default-features=false, features=["avcodec", "avformat", "swresample", "static"] }
+ffmpeg-sys-next = { git="https://github.com/Kingtous/rust-ffmpeg-sys.git", branch="fix/4.4.0", default-features=false, features=["avcodec", "avformat", "swresample"] }
-ffmpeg-sys-next = { git="https://github.com/KetaDotCC/rust-ffmpeg-sys.git", branch="master", default-features=false, features=["avcodec", "avformat", "swresample", "static"] }
+ffmpeg-sys-next = { git="https://github.com/KetaDotCC/rust-ffmpeg-sys.git", branch="master", default-features=false, features=["avcodec", "avformat", "swresample"] }
thiserror = "1.0"
log = "0.4"

12
pkgs/by-name/ru/rustplayer/package.nix
View File

@ -4,18 +4,18 @@
, pkg-config
, openssl
, alsa-lib
, ffmpeg_4
, ffmpeg_6
}:
rustPlatform.buildRustPackage {
pname = "rustplayer";
version = "unstable-2022-12-29";
version = "1.1.2-unstable-2024-07-14";
src = fetchFromGitHub {
owner = "Kingtous";
repo = "RustPlayer";
rev = "a369bc19ab4a8c568c73be25c5e6117e1ee5d848";
sha256 = "sha256-x82EdA7ezCzux1C85IcI2ZQ3M95sH6/k97Rv6lqc5eo=";
rev = "29a16f01912bc3e92008c7ae2f9569c8d7250bd3";
hash = "sha256-+36dLp54rfNK0lSSTG5+J6y51NUtBhtwfhD7L23J5aY=";
};
# This patch is from the source
@ -26,11 +26,11 @@ rustPlatform.buildRustPackage {
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"ffmpeg-sys-next-4.4.0" = "sha256-TBgf+J+ud7nnVjf0r98/rujFPEayjEaVi+vnSE6/5Ak=";
"ffmpeg-sys-next-6.0.1" = "sha256-/CcyWDPeVLVSV8NfWFJhj1tGmuqLPnnyvVosIXM27NI=";
};
};
nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ];
buildInputs = [ alsa-lib openssl ffmpeg_4 ];
buildInputs = [ alsa-lib openssl ffmpeg_6 ];
checkFlags = [
# network required