diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2021-07-27 08:50:32 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-27 08:50:32 -0500 |
| commit | ac1cc7bce1194e189bb1dcb2e9980d0bc6b1c5fd (patch) | |
| tree | 57e13cce0e1b2abee6943ad84d1f0760d8e12a74 | |
| parent | d1d57e50ba94657fac8a3242f9beb42a130003f2 (diff) | |
| parent | 04393d5dfdbad5a5f28ceecd9ae1414f062c180e (diff) | |
| download | nixpkgs-ac1cc7bce1194e189bb1dcb2e9980d0bc6b1c5fd.tar nixpkgs-ac1cc7bce1194e189bb1dcb2e9980d0bc6b1c5fd.tar.gz nixpkgs-ac1cc7bce1194e189bb1dcb2e9980d0bc6b1c5fd.tar.bz2 nixpkgs-ac1cc7bce1194e189bb1dcb2e9980d0bc6b1c5fd.tar.lz nixpkgs-ac1cc7bce1194e189bb1dcb2e9980d0bc6b1c5fd.tar.xz nixpkgs-ac1cc7bce1194e189bb1dcb2e9980d0bc6b1c5fd.tar.zst nixpkgs-ac1cc7bce1194e189bb1dcb2e9980d0bc6b1c5fd.zip | |
Merge pull request #131489 from marsam/update-gonic
gonic: 0.12.2 -> 0.13.1
| -rw-r--r-- | pkgs/servers/gonic/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 11 insertions, 7 deletions
diff --git a/pkgs/servers/gonic/default.nix b/pkgs/servers/gonic/default.nix index 1ff50079ebd..57623a8026b 100644 --- a/pkgs/servers/gonic/default.nix +++ b/pkgs/servers/gonic/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGoModule, fetchFromGitHub +{ lib, stdenv, buildGoModule, fetchFromGitHub , pkg-config, taglib, alsa-lib -, zlib +, zlib, AudioToolbox, AppKit # Disable on-the-fly transcoding, # removing the dependency on ffmpeg. @@ -12,16 +12,18 @@ buildGoModule rec { pname = "gonic"; - version = "0.12.2"; + version = "0.13.1"; src = fetchFromGitHub { owner = "sentriz"; repo = pname; - rev = "7d420f61a90739cd82a81c2740274c538405d950"; - sha256 = "0ix33cbhik1580h1jgv6n512dcgip436wmljpiw53c9v438k0ps5"; + rev = "v${version}"; + sha256 = "08zr5cbmn25wfi1sjfsb311ycn1855x57ypyn5165zcz49pcfzxn"; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ taglib alsa-lib zlib ]; + buildInputs = [ taglib zlib ] + ++ lib.optionals stdenv.isLinux [ alsa-lib ] + ++ lib.optionals stdenv.isDarwin [ AudioToolbox AppKit ]; vendorSha256 = "0inxlqxnkglz4j14jav8080718a80nqdcl866lkql8r6zcxb4fm9"; # TODO(Profpatsch): write a test for transcoding support, diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e05755cea5..5ab47db86f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24603,7 +24603,9 @@ in gollum = callPackage ../applications/misc/gollum { }; - gonic = callPackage ../servers/gonic { }; + gonic = callPackage ../servers/gonic { + inherit (darwin.apple_sdk.frameworks) AppKit AudioToolbox; + }; googleearth = callPackage ../applications/misc/googleearth { }; |