调整打包

CMakeLists.txt

@@ -24,6 +24,7 @@ target_link_libraries(hpcstat PRIVATE fmt::fmt Boost::headers Boost::filesystem
   nlohmann_json::nlohmann_json range-v3::range-v3)
 
 install(TARGETS hpcstat RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+install(DIRECTORY share/ DESTINATION ${CMAKE_INSTALL_DATADIR}/hpcstat)
 
 get_property(ImportedTargets DIRECTORY "${CMAKE_SOURCE_DIR}" PROPERTY IMPORTED_TARGETS)
 message("Imported targets: ${ImportedTargets}")

default.nix

@@ -0,0 +1,18 @@
+{
+  stdenv, cmake, pkg-config, standalone ? false, makeWrapper,
+  boost, fmt, zxorm, nlohmann_json, zpp-bits, range-v3, nameof, openssh
+}: stdenv.mkDerivation
+{
+  name = "hpcstat";
+  src = ./.;
+  buildInputs =
+    [ boost fmt zxorm nlohmann_json zpp-bits range-v3 nameof ];
+  nativeBuildInputs = [ cmake pkg-config makeWrapper ];
+  postInstall =
+    if standalone then "cp ${openssh}/bin/{ssh-add,ssh-keygen} $out/bin"
+    else
+    ''
+      wrapProgram $out/bin/hpcstat --set HPCSTAT_SHAREDIR $out/share/hpcstat \
+        --set HPCSTAT_DATADIR /var/lib/hpcstat
+    '';
+}

flake.nix

@@ -14,30 +14,20 @@
             { pkgs = final; inherit (inputs.nixpkgs) lib; topInputs = inputs.nixos.inputs; };
         })];
       });
-    in
+    in rec
     {
       packages.x86_64-linux = rec
       {
-        hpcstat = pkgs.pkgsStatic.stdenv.mkDerivation
-        {
-          name = "hpcstat";
-          src = ./.;
-          buildInputs = with pkgs.pkgsStatic;
-            [ boost fmt localPackages.zxorm nlohmann_json localPackages.zpp-bits range-v3 localPackages.nameof ];
-          nativeBuildInputs = with pkgs; [ cmake pkg-config ];
-          postInstall = "cp ${openssh}/bin/{ssh-add,ssh-keygen} $out/bin";
-        };
+        hpcstat = pkgs.pkgsStatic.callPackage ./.
+          { inherit (pkgs.pkgsStatic.localPackages) zxorm zpp-bits nameof; inherit openssh; standalone = true; };
         default = hpcstat;
         openssh = (pkgs.pkgsStatic.openssh.override { withLdns = false; etcDir = null; })
           .overrideAttrs (prev: { doCheck = false; patches = prev.patches ++ [ ./openssh.patch ];});
       };
       devShell.x86_64-linux = pkgs.mkShell
       {
-        nativeBuildInputs = with pkgs; [ pkg-config cmake clang-tools_18 ];
-        buildInputs = (with pkgs.pkgsStatic;
-          [ fmt boost localPackages.zxorm nlohmann_json localPackages.zpp-bits range-v3 localPackages.nameof ]);
-        # hardeningDisable = [ "all" ];
-        # NIX_DEBUG = "1";
+        inputsFrom = [ packages.x86_64-linux.hpcstat ];
+        nativeBuildInputs = with pkgs; [ clang-tools_18 ];
         CMAKE_EXPORT_COMPILE_COMMANDS = "1";
       };
     };

src/env.cpp

@@ -15,5 +15,4 @@ namespace hpcstat::env
     }
     else return value;
   }
-  // XDG_SESSION_ID HPCSTAT_SUBACCOUNT SSH_CONNECTION
 }

src/ssh.cpp

@@ -14,12 +14,12 @@ namespace hpcstat::ssh
 {
   std::optional<std::string> fingerprint()
   {
-    if (auto datadir = env::env("HPCSTAT_DATADIR", true); !datadir)
+    if (auto sharedir = env::env("HPCSTAT_SHAREDIR", true); !sharedir)
       return std::nullopt;
     else if
     (
       auto output =
-        exec(std::filesystem::path(*datadir) / "ssh-add", { "-l" });
+        exec(std::filesystem::path(*sharedir) / "ssh-add", { "-l" });
       !output
     )
       { std::cerr << "Failed to get ssh fingerprints\n"; return std::nullopt; }
@@ -39,16 +39,16 @@ namespace hpcstat::ssh
   }
   std::optional<std::string> sign(std::string message, std::string fingerprint)
   {
-    if (auto datadir = env::env("HPCSTAT_DATADIR", true); !datadir)
+    if (auto sharedir = env::env("HPCSTAT_SHAREDIR", true); !sharedir)
       return std::nullopt;
     else if
     (
       auto output = exec
       (
-        std::filesystem::path(*datadir) / "ssh-keygen",
+        std::filesystem::path(*sharedir) / "ssh-keygen",
         {
           "-Y", "sign", "-q",
-          "-f", fmt::format("{}/keys/{}", *datadir, Keys[fingerprint].PubkeyFilename),
+          "-f", fmt::format("{}/keys/{}", *sharedir, Keys[fingerprint].PubkeyFilename),
           "-n", "hpcstat@chn.moe", "-"
         },
         message
@@ -60,7 +60,7 @@ namespace hpcstat::ssh
   }
   bool verify(std::string message, std::string signature, std::string fingerprint)
   {
-    if (auto datadir = env::env("HPCSTAT_DATADIR", true); !datadir)
+    if (auto sharedir = env::env("HPCSTAT_SHAREDIR", true); !sharedir)
       return false;
     else
     {
@@ -71,10 +71,10 @@ namespace hpcstat::ssh
       std::ofstream(signaturefile) << signature;
       return exec
       (
-        std::filesystem::path(*datadir) / "ssh-keygen",
+        std::filesystem::path(*sharedir) / "ssh-keygen",
         {
           "-Y", "verify",
-          "-f", fmt::format("{}/keys/{}", *datadir, Keys[fingerprint].PubkeyFilename),
+          "-f", fmt::format("{}/keys/{}", *sharedir, Keys[fingerprint].PubkeyFilename),
           "-n", "hpcstat@chn.moe", "-s", signaturefile.string()
         },
         message