diff --git a/pkgs/applications/misc/xygrib/default.nix b/pkgs/by-name/xy/xygrib/package.nix similarity index 93% rename from pkgs/applications/misc/xygrib/default.nix rename to pkgs/by-name/xy/xygrib/package.nix index 67d3e165702b..0d75836e8cb0 100644 --- a/pkgs/applications/misc/xygrib/default.nix +++ b/pkgs/by-name/xy/xygrib/package.nix @@ -2,15 +2,13 @@ lib, stdenv, fetchFromGitHub, - wrapQtAppsHook, cmake, bzip2, - qtbase, - qttools, libnova, proj, libpng, openjpeg, + qt5, }: stdenv.mkDerivation { @@ -21,17 +19,17 @@ stdenv.mkDerivation { owner = "opengribs"; repo = "XyGrib"; rev = "88c425ca2d7f4ba5d7ab75bfa25e177bee02d310"; - sha256 = "sha256-qMMeRYIQqJpVRE3YjbXIiXHwS/CHs9l2QihszwQIr/A="; + hash = "sha256-qMMeRYIQqJpVRE3YjbXIiXHwS/CHs9l2QihszwQIr/A="; }; nativeBuildInputs = [ cmake - qttools - wrapQtAppsHook + qt5.qttools + qt5.wrapQtAppsHook ]; buildInputs = [ bzip2 - qtbase + qt5.qtbase libnova proj openjpeg diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f13b0774501d..37a6950419e8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10937,8 +10937,6 @@ with pkgs; xppen_4 ; - xygrib = libsForQt5.callPackage ../applications/misc/xygrib { }; - ydiff = with python3.pkgs; toPythonApplication ydiff; yokadi = python3Packages.callPackage ../applications/misc/yokadi { };