diff --git a/pkgs/tools/misc/hpcg/default.nix b/pkgs/by-name/hp/hpcg/package.nix similarity index 89% rename from pkgs/tools/misc/hpcg/default.nix rename to pkgs/by-name/hp/hpcg/package.nix index 3ae5e7e1404a..7a02f5adad8f 100644 --- a/pkgs/tools/misc/hpcg/default.nix +++ b/pkgs/by-name/hp/hpcg/package.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchurl, mpi } : +{ + lib, + stdenv, + fetchurl, + mpi, +}: stdenv.mkDerivation rec { pname = "hpcg"; @@ -9,19 +14,23 @@ stdenv.mkDerivation rec { sha256 = "197lw2nwmzsmfsbvgvi8z7kj69n374kgfzzp8pkmk7mp2vkk991k"; }; - dontConfigure = true; - - enableParallelBuilding = true; - buildInputs = [ mpi ]; makeFlags = [ "arch=Linux_MPI" ]; + enableParallelBuilding = true; + + dontConfigure = true; + installPhase = '' + runHook preInstall + mkdir -p $out/bin $out/share/hpcg cp bin/xhpcg $out/bin cp bin/hpcg.dat $out/share/hpcg + + runHook postInstall ''; meta = with lib; { @@ -33,4 +42,3 @@ stdenv.mkDerivation rec { mainProgram = "xhpcg"; }; } - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 986aff5d7b5b..d51f46347610 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30130,8 +30130,6 @@ with pkgs; hpack = haskell.lib.compose.justStaticExecutables haskellPackages.hpack; - hpcg = callPackage ../tools/misc/hpcg { }; - hpl = callPackage ../tools/misc/hpl { }; hpmyroom = libsForQt5.callPackage ../applications/networking/hpmyroom { };