diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-03-24 11:04:41 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-03-24 11:04:41 +0100 |
commit | 5423cabbbf2b6dec5568f1ecabd288d5d9a642ec (patch) | |
tree | f316a6a921bfefd3a63bd4502c2eb50ff1644f67 /nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg | |
parent | 46a88117a05c3469af5d99433af140c3de8ca088 (diff) | |
parent | 8aa81f34981add12aecada6c702ddbbd0375ca36 (diff) | |
download | nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.gz nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.bz2 nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.lz nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.xz nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.zst nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.zip |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix index fdce5118e6b3..750a5aa8d002 100644 --- a/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix +++ b/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix @@ -3,16 +3,20 @@ , lib }: -ffmpeg_6-full.overrideAttrs (old: rec { - pname = "jellyfin-ffmpeg"; +let version = "6.0.1-3"; +in - src = fetchFromGitHub { +(ffmpeg_6-full.override { + inherit version; # Important! This sets the ABI. + source = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-ffmpeg"; rev = "v${version}"; hash = "sha256-UINiXO61nB/AL0HJJy7G7emujakk/mQv81aUioyJz0Y="; }; +}).overrideAttrs (old: { + pname = "jellyfin-ffmpeg"; # Clobber upstream patches as they don't apply to the Jellyfin fork patches = []; |