diff options
| author | Zane van Iperen <zane@zanevaniperen.com> | 2022-10-24 19:23:35 +1000 |
|---|---|---|
| committer | Zane van Iperen <zane@zanevaniperen.com> | 2022-11-08 00:12:35 +1000 |
| commit | c100d631369a4279fa99a87b8d9563a8b13d4ab8 (patch) | |
| tree | 10f3137ed11ed32d7e463de4672c13951b8ef173 | |
| parent | 822bf096f21588ccd69b4cb4260909e5be34b7a7 (diff) | |
| download | nixpkgs-c100d631369a4279fa99a87b8d9563a8b13d4ab8.tar nixpkgs-c100d631369a4279fa99a87b8d9563a8b13d4ab8.tar.gz nixpkgs-c100d631369a4279fa99a87b8d9563a8b13d4ab8.tar.bz2 nixpkgs-c100d631369a4279fa99a87b8d9563a8b13d4ab8.tar.lz nixpkgs-c100d631369a4279fa99a87b8d9563a8b13d4ab8.tar.xz nixpkgs-c100d631369a4279fa99a87b8d9563a8b13d4ab8.tar.zst nixpkgs-c100d631369a4279fa99a87b8d9563a8b13d4ab8.zip | |
navidrome: depend on ffmpeg-headless explicitly
| -rw-r--r-- | pkgs/servers/misc/navidrome/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/servers/misc/navidrome/default.nix b/pkgs/servers/misc/navidrome/default.nix index 0833a1ec1a6..8c63b0fb940 100644 --- a/pkgs/servers/misc/navidrome/default.nix +++ b/pkgs/servers/misc/navidrome/default.nix @@ -4,7 +4,7 @@ , lib , pkg-config , stdenv -, ffmpeg +, ffmpeg-headless , taglib , zlib , makeWrapper @@ -54,7 +54,7 @@ buildGoModule { postFixup = lib.optionalString ffmpegSupport '' wrapProgram $out/bin/navidrome \ - --prefix PATH : ${lib.makeBinPath [ ffmpeg ]} + --prefix PATH : ${lib.makeBinPath [ ffmpeg-headless ]} ''; passthru = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 33565644aa3..6fd78c323b9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37934,9 +37934,7 @@ with pkgs; gpio-utils = callPackage ../os-specific/linux/kernel/gpio-utils.nix { }; - navidrome = callPackage ../servers/misc/navidrome { - ffmpeg = ffmpeg-headless; - }; + navidrome = callPackage ../servers/misc/navidrome { }; zalgo = callPackage ../tools/misc/zalgo { }; |