From da3abd5b24d754135bca309f0ce5bd67d4c1d2da Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Wed, 23 Apr 2025 21:53:27 +0100 Subject: [PATCH 1/2] kew: 3.1.2 -> 3.2.0 --- pkgs/by-name/ke/kew/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ke/kew/package.nix b/pkgs/by-name/ke/kew/package.nix index d58fef547d01..ef1bb480003f 100644 --- a/pkgs/by-name/ke/kew/package.nix +++ b/pkgs/by-name/ke/kew/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "kew"; - version = "3.1.2"; + version = "3.2.0"; src = fetchFromGitHub { owner = "ravachol"; repo = "kew"; tag = "v${finalAttrs.version}"; - hash = "sha256-64xdxRx4OanAcLgir9N7p/q71+gQYhffnWnxZzz93h8="; + hash = "sha256-nntbxDy1gfd4F/FvlilLeOAepqtxhnYE2XRjJSlFvgI="; }; nativeBuildInputs = [ pkg-config ]; From d6bbfcdfc89abdb15439b4dbbf3874d13c64e847 Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Tue, 29 Apr 2025 23:03:53 +0100 Subject: [PATCH 2/2] kew: linux audio fix --- pkgs/by-name/ke/kew/package.nix | 49 ++++++++++++++++++++++++++------- 1 file changed, 39 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ke/kew/package.nix b/pkgs/by-name/ke/kew/package.nix index ef1bb480003f..5bcd51ad9ead 100644 --- a/pkgs/by-name/ke/kew/package.nix +++ b/pkgs/by-name/ke/kew/package.nix @@ -1,20 +1,29 @@ { + config, lib, stdenv, - fetchFromGitHub, - fftwFloat, + alsa-lib, + autoPatchelfHook, chafa, curl, - glib, - libopus, - opusfile, - libvorbis, - taglib, faad2, + fetchFromGitHub, + fftwFloat, + glib, libogg, - pkg-config, - versionCheckHook, + libopus, + libjack2, + libpulseaudio, + libvorbis, nix-update-script, + opusfile, + pkg-config, + taglib, + versionCheckHook, + + withALSA ? stdenv.hostPlatform.isLinux, + withJACK ? false, + withPulseaudio ? config.pulseaudio or stdenv.hostPlatform.isLinux, }: stdenv.mkDerivation (finalAttrs: { @@ -28,7 +37,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-nntbxDy1gfd4F/FvlilLeOAepqtxhnYE2XRjJSlFvgI="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = + [ + pkg-config + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + autoPatchelfHook + ]; + buildInputs = [ fftwFloat.dev chafa @@ -42,6 +58,19 @@ stdenv.mkDerivation (finalAttrs: { libogg ]; + runtimeDependencies = + lib.optionals withPulseaudio [ + libpulseaudio + ] + ++ lib.optionals (withALSA || withJACK) [ + alsa-lib + ] + ++ lib.optionals withJACK [ + libjack2 + ]; + + enableParallelBuilding = true; + installFlags = [ "MAN_DIR=${placeholder "out"}/share/man" "PREFIX=${placeholder "out"}"