Remove version lock for shairport-sync
The current version in nixpkgs is newer than the one we are currently locking, the nqptp fix was also already in nixpkgs.
This commit is contained in:
parent
9d9b8ede02
commit
d854b93393
32
flake.nix
32
flake.nix
|
@ -26,43 +26,11 @@
|
||||||
outputs = { self, nixpkgs, nixpkgs-unstable, nixos-generators, sops-nix, ... }:
|
outputs = { self, nixpkgs, nixpkgs-unstable, nixos-generators, sops-nix, ... }:
|
||||||
let
|
let
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
# Shairport Sync 4.3.1 (with nqptp 1.2.4) with metadata, MQTT and AirPlay 2 support.
|
|
||||||
shairportSync431ExtendedNixpkgsUnstableOverlay = final: prev: {
|
shairportSync431ExtendedNixpkgsUnstableOverlay = final: prev: {
|
||||||
shairport-sync = (prev.shairport-sync.override { enableMetadata = true; enableAirplay2 = true; }).overrideAttrs (finalAttr: previousAttr: {
|
shairport-sync = (prev.shairport-sync.override { enableMetadata = true; enableAirplay2 = true; }).overrideAttrs (finalAttr: previousAttr: {
|
||||||
# See: https://github.com/mikebrady/shairport-sync/blob/e78a88b64adfe7b5f88fd6faedf55c57445bb240/CONFIGURATION%20FLAGS.md
|
# See: https://github.com/mikebrady/shairport-sync/blob/e78a88b64adfe7b5f88fd6faedf55c57445bb240/CONFIGURATION%20FLAGS.md
|
||||||
configureFlags = previousAttr.configureFlags ++ [ "--with-mqtt-client" ];
|
configureFlags = previousAttr.configureFlags ++ [ "--with-mqtt-client" ];
|
||||||
buildInputs = previousAttr.buildInputs ++ [ final.mosquitto ];
|
buildInputs = previousAttr.buildInputs ++ [ final.mosquitto ];
|
||||||
# Use specific Shairport Sync and nqptp versions, since with those the
|
|
||||||
# following error doesn't happen:
|
|
||||||
# fatal error: The nqptp service on this system, which is required for
|
|
||||||
# Shairport Sync to operate, does not seem to be initialised.
|
|
||||||
#
|
|
||||||
# Also use a more recent dev version to fix Pipewire stuttering issue.
|
|
||||||
# See:
|
|
||||||
# https://github.com/mikebrady/shairport-sync/issues/1736
|
|
||||||
# https://github.com/mikebrady/shairport-sync/blob/a65ec2d7f1f380bbae196d7f8f1cd6a88ef5777b/RELEASENOTES-DEVELOPMENT.md#version-432-dev-51-g98679bbb
|
|
||||||
src = final.fetchFromGitHub {
|
|
||||||
owner = "mikebrady";
|
|
||||||
repo = finalAttr.pname;
|
|
||||||
rev = "98679bbb54f5aaeda859e34aa28425647b8d179e";
|
|
||||||
hash = "sha256-k0kcgtWk2xlG34lP0ryEaqdskYMNM68YnIRLwFR3jaY=";
|
|
||||||
};
|
|
||||||
});
|
|
||||||
nqptp = prev.nqptp.overrideAttrs (finalAttr: previousAttr: {
|
|
||||||
# See Shairport Sync version note.
|
|
||||||
src = final.fetchFromGitHub {
|
|
||||||
owner = "mikebrady";
|
|
||||||
repo = finalAttr.pname;
|
|
||||||
rev = "1.2.4";
|
|
||||||
hash = "sha256-roTNcr3v2kzE6vQ5plAVtlw1+2yJplltOYsGGibtoZo=";
|
|
||||||
};
|
|
||||||
# Custom install phase to avoid setcap.
|
|
||||||
# See:
|
|
||||||
# https://github.com/mikebrady/nqptp/blob/1.2.4/Makefile.am#L23
|
|
||||||
installPhase = ''
|
|
||||||
mkdir -p $out/bin
|
|
||||||
cp nqptp $out/bin/
|
|
||||||
'';
|
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
pkgs-unstable = nixpkgs-unstable.legacyPackages."x86_64-linux";
|
pkgs-unstable = nixpkgs-unstable.legacyPackages."x86_64-linux";
|
||||||
|
|
Loading…
Reference in a new issue