From a3fd29dbc2a87e293d5840065f833f2374a9a8ea Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Thu, 9 Jul 2026 23:53:31 +0200 Subject: [PATCH] rPackages.sodium: move dependencies --- pkgs/development/r-modules/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index dee689caf6a0..435b373e0dfe 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -635,6 +635,7 @@ let gfortran gettext ]; + sodium = [ pkgs.pkg-config ]; lwgeom = with pkgs; [ pkg-config geos # for geos-config @@ -1230,6 +1231,7 @@ let cgl clp ]; + sodium = [ pkgs.libsodium ]; gdalcubes = with pkgs; [ proj.dev gdal @@ -2932,15 +2934,11 @@ let ''; }); - sodium = old.sodium.overrideAttrs ( - attrs: with pkgs; { - preConfigure = '' - patchShebangs configure - ''; - nativeBuildInputs = [ pkg-config ] ++ attrs.nativeBuildInputs; - buildInputs = [ libsodium.dev ] ++ attrs.buildInputs; - } - ); + sodium = old.sodium.overrideAttrs (attrs: { + preConfigure = '' + patchShebangs configure + ''; + }); keyring = old.keyring.overrideAttrs (attrs: { preConfigure = ''