diff --git a/pkgs/servers/hqplayerd/default.nix b/pkgs/servers/hqplayerd/default.nix index e2b3abc6c0a6..fb6194eaab3d 100644 --- a/pkgs/servers/hqplayerd/default.nix +++ b/pkgs/servers/hqplayerd/default.nix @@ -1,6 +1,6 @@ -{ stdenv -, alsa-lib +{ stdenv, lib , addOpenGLRunpath +, alsa-lib , autoPatchelfHook , cairo , fetchurl @@ -8,26 +8,25 @@ , gcc11 , gnome , gssdp -, lame -, lib -, libgmpris -, llvmPackages_10 -, mpg123 -, rpmextract -, wavpack - , gupnp , gupnp-av +, lame +, libgmpris +, libusb-compat-0_1 +, llvmPackages_10 , meson +, mpg123 , ninja +, rpmextract +, wavpack }: stdenv.mkDerivation rec { pname = "hqplayerd"; - version = "4.30.3-87"; + version = "4.31.0-89"; src = fetchurl { url = "https://www.signalyst.eu/bins/${pname}/fc35/${pname}-${version}.fc35.x86_64.rpm"; - hash = "sha256-fEze4aScWDwHDTXU0GatdopQf6FWcywWCGhR/7zXK7A="; + hash = "sha256-L9S3MIbvvBViKSxu0x/GkE/pa61NETtw4vA8xM4rJEg="; }; unpackPhase = '' @@ -47,6 +46,7 @@ stdenv.mkDerivation rec { gupnp-av lame libgmpris + libusb-compat-0_1 llvmPackages_10.openmp mpg123 wavpack @@ -58,34 +58,37 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - # main executable - mkdir -p $out/bin - cp ./usr/bin/hqplayerd $out/bin + # executables + mkdir -p $out + cp -rv ./usr/bin $out/bin - # main configuration - mkdir -p $out/etc/hqplayer - cp ./etc/hqplayer/hqplayerd.xml $out/etc/hqplayer/ + # libs + mkdir -p $out + cp -rv ./opt/hqplayerd/lib $out + + # configuration + mkdir -p $out/etc + cp -rv ./etc/hqplayer $out/etc/ # udev rules - mkdir -p $out/etc/udev/rules.d - cp ./etc/udev/rules.d/50-taudio2.rules $out/etc/udev/rules.d/ + mkdir -p $out/etc/udev + cp -rv ./etc/udev/rules.d $out/etc/udev/ # kernel module cfgs - mkdir -p $out/etc/modules-load.d - cp ./etc/modules-load.d/taudio2.conf $out/etc/modules-load.d/ + mkdir -p $out/etc + cp -rv ./etc/modules-load.d $out/etc/ # systemd service file - mkdir -p $out/lib/systemd/system - cp ./usr/lib/systemd/system/hqplayerd.service $out/lib/systemd/system/ + mkdir -p $out/lib/systemd + cp -rv ./usr/lib/systemd/system $out/lib/systemd/ # documentation - mkdir -p $out/share/doc/hqplayerd - cp ./usr/share/doc/hqplayerd/* $out/share/doc/hqplayerd/ + mkdir -p $out/share/doc + cp -rv ./usr/share/doc/hqplayerd $out/share/doc/ # misc service support files - mkdir -p $out/var/lib/hqplayer - cp -r ./var/lib/hqplayer/web $out/var/lib/hqplayer - + mkdir -p $out/var/lib + cp -rv ./var/lib/hqplayer $out/var/lib/ runHook postInstall '';