diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-09-27 16:00:58 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-09-27 16:00:58 +0000 |
| commit | c504e5d19d940926b3ddcf62c983d66f49f3cbb2 (patch) | |
| tree | ec955e58bcac2cb93b9f8c10786b23f61d40cd7e /nixpkgs/pkgs/servers/slimserver/default.nix | |
| parent | 72789cefce7b17419815f600fbd18238d89afcc9 (diff) | |
| parent | 1737f98af6667560e3e4f930312f9b5002649d04 (diff) | |
| download | nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.gz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.bz2 nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.lz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.xz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.zst nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.zip | |
Merge commit '1737f98af6667560e3e4f930312f9b5002649d04'
Conflicts: nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix nixpkgs/pkgs/development/node-packages/default.nix nixpkgs/pkgs/development/python-modules/priority/deadline.patch
Diffstat (limited to 'nixpkgs/pkgs/servers/slimserver/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/servers/slimserver/default.nix | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/servers/slimserver/default.nix b/nixpkgs/pkgs/servers/slimserver/default.nix index 3e28f5010499..7296635c7ddc 100644 --- a/nixpkgs/pkgs/servers/slimserver/default.nix +++ b/nixpkgs/pkgs/servers/slimserver/default.nix @@ -1,13 +1,24 @@ -{ lib, fetchurl, makeWrapper -, perlPackages, flac, faad2, sox, lame, monkeysAudio, wavpack }: +{ lib +, fetchFromGitHub +, makeWrapper +, perlPackages +, flac +, faad2 +, sox +, lame +, monkeysAudio +, wavpack +}: perlPackages.buildPerlPackage rec { pname = "slimserver"; version = "7.9.2"; - src = fetchurl { - url = "https://github.com/Logitech/slimserver/archive/${version}.tar.gz"; - sha256 = "1rn9y7xvg5aqmgcbfpi7lcqy8d7hgwqx8b2llzpzrv7854zm1wcw"; + src = fetchFromGitHub { + owner = "Logitech"; + repo = "slimserver"; + rev = version; + hash = "sha256-P4CSu/ff6i48uWV5gXsJgayZ1S1s0RAqa5O5y3Y0g9Y="; }; buildInputs = [ @@ -73,7 +84,7 @@ perlPackages.buildPerlPackage rec { # relax audio scan version constraints substituteInPlace lib/Audio/Scan.pm --replace "0.93" "1.01" substituteInPlace modules.conf --replace "Audio::Scan 0.93 0.95" "Audio::Scan 0.93" - ''; + ''; preConfigurePhase = ""; |