Compare commits

...

3 commits

4 changed files with 63 additions and 14 deletions

View file

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

View file

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

View file

@ -0,0 +1,45 @@
{
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;
};
}

View file

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