diff --git a/pkgs/by-name/gi/giada/package.nix b/pkgs/by-name/gi/giada/package.nix index 2880bce40f8b..fc875f7685dc 100644 --- a/pkgs/by-name/gi/giada/package.nix +++ b/pkgs/by-name/gi/giada/package.nix @@ -1,24 +1,26 @@ -{ 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, + fontconfig, + fmt, + rtmidi, + libsamplerate, + libmpg123, + libsndfile, + jack2, + alsa-lib, + libpulseaudio, + libXpm, + libXrandr, + flac, + libogg, + libvorbis, + libopus, + nlohmann_json, }: stdenv.mkDerivation (finalAttrs: { @@ -47,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"; 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