diff --git a/pkgs/applications/science/misc/graphia/default.nix b/pkgs/by-name/gr/graphia/package.nix similarity index 81% rename from pkgs/applications/science/misc/graphia/default.nix rename to pkgs/by-name/gr/graphia/package.nix index 9df8a729f035..dfe38b62a56e 100644 --- a/pkgs/applications/science/misc/graphia/default.nix +++ b/pkgs/by-name/gr/graphia/package.nix @@ -4,35 +4,31 @@ cmake, git, fetchFromGitHub, - wrapQtAppsHook, - qtbase, - qtdeclarative, - qtsvg, - qtwebengine, + qt6, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "graphia"; version = "5.2"; src = fetchFromGitHub { owner = "graphia-app"; repo = "graphia"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-tS5oqpwpqvWGu67s8OuA4uQR3Zb5VzHTY/GnfVQki6k="; }; nativeBuildInputs = [ cmake git # needs to define some hash as a version - wrapQtAppsHook + qt6.wrapQtAppsHook ]; buildInputs = [ - qtbase - qtdeclarative - qtsvg - qtwebengine + qt6.qtbase + qt6.qtdeclarative + qt6.qtsvg + qt6.qtwebengine ]; meta = { @@ -46,4 +42,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.bgamari ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e17f9171466..3c3a5ebe72ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6637,9 +6637,6 @@ with pkgs; ghp-import = with python3Packages; toPythonApplication ghp-import; ghcid = haskellPackages.ghcid.bin; - - graphia = qt6Packages.callPackage ../applications/science/misc/graphia { }; - glfw = glfw3; glfw3-minecraft = callPackage ../by-name/gl/glfw3/package.nix {