mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-22 00:20:58 +00:00
rPackages.sodium: move dependencies
This commit is contained in:
committed by
Michael Daniels
parent
08a7cf3bd6
commit
a3fd29dbc2
@@ -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 = ''
|
||||
|
||||
Reference in New Issue
Block a user