git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #131489 from marsam/update-gonic

gonic: 0.12.2 -> 0.13.1

commitac1cc7bce1194e189bb1dcb2e9980d0bc6b1c5fd authorMario Rodas <marsam@users.noreply.github.com> dateTue 27 Jul 2021, 08:50 (5 years ago) parentd1d57e504393d5
2 files changed+11−7
pkgs/servers/gonic/default.nix+8−6 pkgs/top-level/all-packages.nix+3−1
pkgs/servers/gonic/default.nix+8−6
@@ -1,6 +1,6 @@
1−{ lib, buildGoModule, fetchFromGitHub
1+{ lib, stdenv, buildGoModule, fetchFromGitHub
22, pkg-config, taglib, alsa-lib
3−, zlib
3+, zlib, AudioToolbox, AppKit
44
55# Disable on-the-fly transcoding,
66# removing the dependency on ffmpeg.
@@ -12,16 +12,18 @@
1212
1313buildGoModule rec {
1414 pname = "gonic";
15− version = "0.12.2";
15+ version = "0.13.1";
1616 src = fetchFromGitHub {
1717 owner = "sentriz";
1818 repo = pname;
19− rev = "7d420f61a90739cd82a81c2740274c538405d950";
20− sha256 = "0ix33cbhik1580h1jgv6n512dcgip436wmljpiw53c9v438k0ps5";
19+ rev = "v${version}";
20+ sha256 = "08zr5cbmn25wfi1sjfsb311ycn1855x57ypyn5165zcz49pcfzxn";
2121 };
2222
2323 nativeBuildInputs = [ pkg-config ];
24− buildInputs = [ taglib alsa-lib zlib ];
24+ buildInputs = [ taglib zlib ]
25+ ++ lib.optionals stdenv.isLinux [ alsa-lib ]
26+ ++ lib.optionals stdenv.isDarwin [ AudioToolbox AppKit ];
2527 vendorSha256 = "0inxlqxnkglz4j14jav8080718a80nqdcl866lkql8r6zcxb4fm9";
2628
2729 # TODO(Profpatsch): write a test for transcoding support,
pkgs/top-level/all-packages.nix+3−1
@@ -24603,7 +24603,9 @@ in
2460324603
2460424604 gollum = callPackage ../applications/misc/gollum { };
2460524605
24606− gonic = callPackage ../servers/gonic { };
24606+ gonic = callPackage ../servers/gonic {
24607+ inherit (darwin.apple_sdk.frameworks) AppKit AudioToolbox;
24608+ };
2460724609
2460824610 googleearth = callPackage ../applications/misc/googleearth { };
2460924611