diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/by-name/ec/eccodes/package.nix similarity index 94% rename from pkgs/development/libraries/eccodes/default.nix rename to pkgs/by-name/ec/eccodes/package.nix index 84ee929e0d1c..5ea1a9d7df36 100644 --- a/pkgs/development/libraries/eccodes/default.nix +++ b/pkgs/by-name/ec/eccodes/package.nix @@ -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 = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf52a865aea1..14c67ff594c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1cb29e0e88c8..a32ba6995988 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4769,7 +4769,7 @@ self: super: with self; { eccodes = toPythonModule ( pkgs.eccodes.override { enablePython = true; - pythonPackages = self; + python3Packages = self; } );