From 9e9e585ca7c0806611c9868c97c118aa0e206c05 Mon Sep 17 00:00:00 2001 From: John Chadwick Date: Tue, 19 Nov 2024 22:45:51 -0500 Subject: [PATCH 1/3] giada: format --- pkgs/by-name/gi/giada/package.nix | 43 ++++++++++++++++--------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/pkgs/by-name/gi/giada/package.nix b/pkgs/by-name/gi/giada/package.nix index 2880bce40f8b..4097e87e851f 100644 --- a/pkgs/by-name/gi/giada/package.nix +++ b/pkgs/by-name/gi/giada/package.nix @@ -1,24 +1,25 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, fltk -, fmt -, rtmidi -, libsamplerate -, libmpg123 -, libsndfile -, jack2 -, alsa-lib -, libpulseaudio -, libXpm -, libXrandr -, flac -, libogg -, libvorbis -, libopus -, nlohmann_json +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + fltk, + fmt, + rtmidi, + libsamplerate, + libmpg123, + libsndfile, + jack2, + alsa-lib, + libpulseaudio, + libXpm, + libXrandr, + flac, + libogg, + libvorbis, + libopus, + nlohmann_json, }: stdenv.mkDerivation (finalAttrs: { From bd20b3a25f0b67854f14f4a40d765b6f23b7d356 Mon Sep 17 00:00:00 2001 From: John Chadwick Date: Tue, 19 Nov 2024 23:02:13 -0500 Subject: [PATCH 2/3] giada: add missing fontconfig dependency --- pkgs/by-name/gi/giada/package.nix | 41 +++++++++++++++++-------------- 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/gi/giada/package.nix b/pkgs/by-name/gi/giada/package.nix index 4097e87e851f..fc875f7685dc 100644 --- a/pkgs/by-name/gi/giada/package.nix +++ b/pkgs/by-name/gi/giada/package.nix @@ -5,6 +5,7 @@ cmake, pkg-config, fltk, + fontconfig, fmt, rtmidi, libsamplerate, @@ -48,24 +49,28 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ]; - buildInputs = [ - rtmidi - fltk - fmt - libmpg123 - libsndfile - libsamplerate - nlohmann_json - alsa-lib - libXpm - libpulseaudio - jack2 - flac - libogg - libvorbis - libopus - libXrandr - ]; + buildInputs = + [ + rtmidi + fltk + fmt + libmpg123 + libsndfile + libsamplerate + nlohmann_json + alsa-lib + libXpm + libpulseaudio + jack2 + flac + libogg + libvorbis + libopus + libXrandr + ] + ++ lib.optionals (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isFreeBSD) [ + fontconfig + ]; meta = { description = "Free, minimal, hardcore audio tool for DJs, live performers and electronic musicians"; From df36d6b5558cf9b5550d95348a6b135ef9801960 Mon Sep 17 00:00:00 2001 From: John Chadwick Date: Tue, 19 Nov 2024 23:11:47 -0500 Subject: [PATCH 3/3] fltk: don't propagate fontconfig --- pkgs/development/libraries/fltk/common.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/fltk/common.nix b/pkgs/development/libraries/fltk/common.nix index d17cc9bd2ae5..43776d5918b6 100644 --- a/pkgs/development/libraries/fltk/common.nix +++ b/pkgs/development/libraries/fltk/common.nix @@ -85,6 +85,8 @@ stdenv.mkDerivation rec { libGLU ] ++ lib.optionals (withExamples && withGL) [ glew + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + fontconfig ]; propagatedBuildInputs = [ @@ -93,7 +95,6 @@ stdenv.mkDerivation rec { libpng ] ++ lib.optionals stdenv.hostPlatform.isLinux [ freetype - fontconfig libX11 libXext libXinerama