flake.lock

@@ -85,11 +85,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1716930911,
-        "narHash": "sha256-t4HT5j3Jy7skRB5PINnxcEBCkgE89rGBpwTI7YS4Ffo=",
+        "lastModified": 1716679503,
+        "narHash": "sha256-aX8AEWHLwuiYX8OCpTnHGrQeei1Gb+AGbk1hq+RIClg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "a9b36cbe9292a649222b89fdb9ae9907e9c74086",
+        "rev": "e4611630c3cc8ed618b48d92f6291f65be9f7913",
         "type": "github"
       },
       "original": {
@@ -129,11 +129,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1716856858,
-        "narHash": "sha256-dfNGs2AW/V31nMVeEBSUJCMfT6bZAKJ5qsWgFHWhvUc=",
+        "lastModified": 1716506851,
+        "narHash": "sha256-fzY708SyfHwLOFrg5ZU0fXW9mNdvRvqz64jg97vvpJM=",
         "ref": "refs/heads/main",
-        "rev": "38f31ee7c1a60adae58833789dd855c128b056c6",
-        "revCount": 85,
+        "rev": "18fa4a89e208cb8e881f5f71c75bbd4c1c2fd37d",
+        "revCount": 83,
         "type": "git",
         "url": "https://git.lix.systems/lix-project/nixos-module"
       },
@@ -149,11 +149,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1716772633,
-        "narHash": "sha256-Idcye44UW+EgjbjCoklf2IDF+XrehV6CVYvxR1omst4=",
+        "lastModified": 1716170277,
+        "narHash": "sha256-fCAiox/TuzWGVaAz16PxrR4Jtf9lN5dwWL2W74DS0yI=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "ff80cb4a11bb87f3ce8459be6f16a25ac86eb2ac",
+        "rev": "e0638db3db43b582512a7de8c0f8363a162842b9",
         "type": "github"
       },
       "original": {
@@ -204,11 +204,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1716769173,
-        "narHash": "sha256-7EXDb5WBw+d004Agt+JHC/Oyh/KTUglOaQ4MNjBbo5w=",
+        "lastModified": 1716509168,
+        "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9ca3f649614213b2aaf5f1e16ec06952fe4c2632",
+        "rev": "bfb7a882678e518398ce9a31a881538679f6f092",
         "type": "github"
       },
       "original": {

flake.nix

@@ -136,7 +136,6 @@
     };
 
     packages.x86_64-linux = {
-      hactoolnet-bin = pkgs.callPackage ./home/packages/hactoolnet-bin/package.nix {};
       irdkit = pkgs.callPackage ./home/packages/irdkit/package.nix {};
       ird_tools = pkgs.callPackage ./home/packages/ird_tools/package.nix {};
       ps3dec = pkgs.callPackage ./home/packages/ps3dec/package.nix {};

home/packages/hactoolnet-bin/package.nix

@@ -1,45 +0,0 @@
-{
-  lib,
-  autoPatchelfHook,
-  fetchzip,
-  gcc,
-  makeWrapper,
-  openssl,
-  stdenv,
-  zlib
-}:
-
-stdenv.mkDerivation rec {
-  name = "hactoolnet-bin";
-  version = "0.19.0";
-
-  src = fetchzip {
-    url = "https://github.com/Thealexbarney/LibHac/releases/download/v0.19.0/hactoolnet-0.19.0-linux.zip";
-    sha256 = "njlIFsAjyKErYatbP+3fmjP5dv3DhJ7G1+KvC2ZPdso=";
-  };
-
-  buildInputs = [
-    autoPatchelfHook
-    makeWrapper
-    gcc.cc
-    zlib
-  ];
-
-  installPhase = ''
-    mkdir -p $out/bin
-    chmod +x hactoolnet
-    cp hactoolnet $out/bin/
-    wrapProgram $out/bin/hactoolnet \
-      --set DOTNET_SYSTEM_GLOBALIZATION_INVARIANT 1 \
-      --set LD_LIBRARY_PATH ${lib.makeLibraryPath [ openssl ]}
-  '';
-
-  meta = {
-    description = "An example program that uses LibHac. It is used in a similar manner to hactool.";
-    homepage = "https://github.com/Thealexbarney/LibHac";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
-    mainProgram = "hactoolnet";
-    platforms = lib.platforms.all;
-  };
-}

home/pkgs_and_programs.nix

@@ -124,7 +124,6 @@ in
     my_packages.ps3dec
     my_packages.sabretools
     my_packages.new_rclone
-    # my_packages.hactoolnet-bin
     # my_packages.rom-properties
 
     agenix.packages.${system}.default
@@ -135,13 +134,11 @@ in
   /*
     pkgs.binutils
       # Just use "nix shell nixpkgs#binutils -c strings -- INPUT"
-    pkgs.hactoolnet-bin
-      # Not needed on WSL as I currently use the Windows version.
     pkgs.mpv
       # Not needed on WSL
     pkgs.p7zip
       # Replaced in favour of nixpkgs#_7zz
-    pkgs.rclone
+    # pkgs.rclone
       # my_packages.new_rclone is the version with the patched build.
     pkgs.terminator
       # Not needed on WSL, even though I'd like it on WSL sometimes.