summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxHearnden <maxoscarhearnden@gmail.com>2023-10-05 08:46:38 +0100
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2023-10-31 21:15:11 +0000
commitadf7ceeca5e7b7c243937b37af2d87a4e30392ce (patch)
tree61951a88214c1b26bd1008443f6c11c4a4ac17b5
parentMerge pull request #264630 from NixOS/backport-264605-to-release-23.05 (diff)
downloadnixpkgs-origin/backport-259137-to-release-23.05.tar.gz
shairport-sync: add xxd to the nativeBuildInputsorigin/backport-259137-to-release-23.05
it is run while building shairport-sync and strictdeps means that it is not added to the path in buildInputs (cherry picked from commit c49eefdfe2216c13043c3b6ae507ed632fcf945b)
-rw-r--r--pkgs/servers/shairport-sync/default.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix
index e7f83db00940..c583fa4ceca7 100644
--- a/pkgs/servers/shairport-sync/default.nix
+++ b/pkgs/servers/shairport-sync/default.nix
@@ -58,6 +58,8 @@ stdenv.mkDerivation rec {
# To achieve this, we coerce the output to a string to prevent
# mkDerivation's splicing logic from kicking in.
"${glib.dev}"
+ ] ++ optional enableAirplay2 [
+ unixtools.xxd
];
makeFlags = [
@@ -83,7 +85,6 @@ stdenv.mkDerivation rec {
libgcrypt
libuuid
ffmpeg
- unixtools.xxd
]
++ optional stdenv.isLinux glib;