eccodes: move to pkgs/by-name
this shouldn't create any rebuilds gccStdenv is the same as stdenv on linux, platforms other than darwin and linux may get a rebuild, however i don't think they were even cosidered when doing this stdenv override
This commit is contained in:
+6
-7
@@ -1,7 +1,7 @@
|
||||
{
|
||||
fetchurl,
|
||||
lib,
|
||||
stdenv,
|
||||
gccStdenv,
|
||||
fetchurl,
|
||||
cmake,
|
||||
netcdf,
|
||||
openjpeg,
|
||||
@@ -11,12 +11,11 @@
|
||||
perl,
|
||||
ctestCheckHook,
|
||||
enablePython ? false,
|
||||
pythonPackages,
|
||||
python3Packages ? null,
|
||||
enablePosixThreads ? false,
|
||||
enableOpenMPThreads ? false,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
gccStdenv.mkDerivation rec {
|
||||
pname = "eccodes";
|
||||
version = "2.44.0";
|
||||
|
||||
@@ -54,8 +53,8 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
propagatedBuildInputs = lib.optionals enablePython [
|
||||
pythonPackages.python
|
||||
pythonPackages.numpy
|
||||
python3Packages.python
|
||||
python3Packages.numpy
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
@@ -6695,11 +6695,6 @@ with pkgs;
|
||||
;
|
||||
};
|
||||
|
||||
eccodes = callPackage ../development/libraries/eccodes {
|
||||
pythonPackages = python3Packages;
|
||||
stdenv = if stdenv.hostPlatform.isDarwin then gccStdenv else stdenv;
|
||||
};
|
||||
|
||||
vapoursynth-editor = libsForQt5.callPackage ../by-name/va/vapoursynth/editor.nix { };
|
||||
|
||||
enchant2 = callPackage ../development/libraries/enchant/2.x.nix { };
|
||||
|
||||
@@ -4769,7 +4769,7 @@ self: super: with self; {
|
||||
eccodes = toPythonModule (
|
||||
pkgs.eccodes.override {
|
||||
enablePython = true;
|
||||
pythonPackages = self;
|
||||
python3Packages = self;
|
||||
}
|
||||
);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user