From db4924827708bd175ab70b283ca357cc0eb65f98 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Thu, 9 Jul 2026 13:50:20 +0200 Subject: [PATCH] rPackages.gdtools: fix dependencies --- pkgs/development/r-modules/default.nix | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 80173528da62..7a78ec908375 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -548,17 +548,7 @@ let ]; gamstransfer = [ pkgs.zlib ]; gdalraster = [ pkgs.pkg-config ]; - gdtools = - with pkgs; - [ - cairo.dev - fontconfig.lib - freetype.dev - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - expat - libxdmcp - ]; + gdtools = [ pkgs.pkg-config ]; GeneralizedWendland = [ pkgs.gsl ]; ggiraph = [ pkgs.libpng.dev ]; git2r = with pkgs; [ @@ -1221,7 +1211,17 @@ let fs = [ pkgs.libuv ]; pgenlibr = [ pkgs.zlib.dev ]; fftw = [ pkgs.fftw ]; - gdtools = [ pkgs.pkg-config ]; + gdtools = + with pkgs; + [ + cairo + fontconfig.lib + freetype + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + expat + libxdmcp + ]; archive = [ pkgs.libarchive ]; lpsymphony = with pkgs; [ symphony