gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #274070 from adamcstephens/slimserver/fix-audioscan

Browse Source 
slimserver: fix audioscan failures
This commit is contained in:
Stig
2023-12-14 05:50:09 +01:00
committed by GitHub
parent 7a9c995451 692408956b
commit e01eb27a46
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/slimserver/default.nix
+8 -3
View File
@@ -16,6 +16,9 @@
let
perlPackages = perl538Packages;
binPath = lib.makeBinPath ([ lame flac faad2 sox wavpack ] ++ (lib.optional stdenv.isLinux monkeysAudio));
libPath = lib.makeLibraryPath [ zlib stdenv.cc.cc.lib ];
in
perlPackages.buildPerlPackage rec {
pname = "slimserver";
@@ -118,6 +121,9 @@ perlPackages.buildPerlPackage rec {
rm -r CPAN
mv CPAN_used CPAN
# another set of vendored/modified modules exist in lib, more selectively cleaned for now
rm -rf lib/Audio
${lib.optionalString (!enableUnfreeFirmware) ''
# remove unfree firmware
rm -rf Firmware
@@ -130,9 +136,8 @@ perlPackages.buildPerlPackage rec {
installPhase = ''
cp -r . $out
wrapProgram $out/slimserver.pl \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ zlib stdenv.cc.cc.lib ]}" \
--prefix PATH : "${lib.makeBinPath ([ lame flac faad2 sox wavpack ] ++ (lib.optional stdenv.isLinux monkeysAudio))}"
wrapProgram $out/slimserver.pl --prefix LD_LIBRARY_PATH : "${libPath}" --prefix PATH : "${binPath}"
wrapProgram $out/scanner.pl --prefix LD_LIBRARY_PATH : "${libPath}" --prefix PATH : "${binPath}"
mkdir $out/bin
ln -s $out/slimserver.pl $out/bin/slimserver
'';
pkgs/top-level/perl-packages.nix
+5 -4
View File
@@ -1294,16 +1294,17 @@ with self; {
AudioScan = buildPerlPackage {
pname = "Audio-Scan";
version = "1.01";
version = "1.05";
src = fetchurl {
url = "mirror://cpan/authors/id/A/AG/AGRUNDMA/Audio-Scan-1.01.tar.gz";
hash = "sha256-gxJyAnHHrdxLvuwzEs3divS5kKxjYgSllsB5M61sY0o=";
url = "https://github.com/Logitech/slimserver-vendor/raw/public/8.3/CPAN/Audio-Scan-1.05.tar.gz";
hash = "sha256-9YXC8GHPRWKlV8emmTke7RB0HhiCbALmZQqtQFLcBi4=";
};
buildInputs = [ pkgs.zlib TestWarn ];
env.NIX_CFLAGS_COMPILE = "-I${pkgs.zlib.dev}/include";
NIX_CFLAGS_LINK = "-L${pkgs.zlib.out}/lib -lz";
meta = {
description = "Fast C metadata and tag reader for all common audio file formats";
description = "Fast C metadata and tag reader for all common audio file formats, slimserver fork";
homepage = "https://github.com/Logitech/slimserver-vendor";
license = with lib.licenses; [ gpl2Plus ];
};
};