diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f4cfa3a6c53..ce37b445adf 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13850,6 +13850,13 @@ fingerprint = "DD54 130B ABEC B65C 1F6B 2A38 8312 4F97 A318 EA18"; }]; }; + p-rintz = { + email = "nix@rintz.net"; + github = "p-rintz"; + githubId = 13933258; + name = "Philipp Rintz"; + matrix = "@philipp:srv.icu"; + }; ProducerMatt = { name = "Matthew Pherigo"; email = "ProducerMatt42@gmail.com"; diff --git a/pkgs/tools/games/pocket-updater-utility/add-runtime-identifier.patch b/pkgs/tools/games/pocket-updater-utility/add-runtime-identifier.patch new file mode 100644 index 00000000000..a01822c0366 --- /dev/null +++ b/pkgs/tools/games/pocket-updater-utility/add-runtime-identifier.patch @@ -0,0 +1,31 @@ +From ccbe5c0401d6965a6daaa0b7bb022f63908c8942 Mon Sep 17 00:00:00 2001 +From: Philipp Rintz +Date: Mon, 28 Aug 2023 19:19:41 +0200 +Subject: [PATCH] uncommited + +--- + pocket_updater.csproj | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/pocket_updater.csproj b/pocket_updater.csproj +index 11f604c..410bd47 100644 +--- a/pocket_updater.csproj ++++ b/pocket_updater.csproj +@@ -12,6 +12,7 @@ + Matt Pannella + Analogue Pocket Updater Utility + https://github.com/mattpannella/pocket-updater-utility ++ @RuntimeIdentifier@ + + + +@@ -26,4 +27,4 @@ + + + +- +\ No newline at end of file ++ +-- +2.40.1 + diff --git a/pkgs/tools/games/pocket-updater-utility/default.nix b/pkgs/tools/games/pocket-updater-utility/default.nix new file mode 100644 index 00000000000..ef52b388ae8 --- /dev/null +++ b/pkgs/tools/games/pocket-updater-utility/default.nix @@ -0,0 +1,59 @@ +{ pkgs ? import { system = builtins.currentSystem; } +, stdenv ? pkgs.stdenv +, lib ? pkgs.lib +, fetchFromGitHub ? pkgs.fetchFromGitHub +, buildDotnetModule ? pkgs.buildDotnetModule +, dotnetCorePackages ? pkgs.dotnetCorePackages +, openssl ? pkgs.openssl +, zlib ? pkgs.zlib +, targetPlatform ? pkgs.targetPlatform +}: + +buildDotnetModule rec { + pname = "pocket-updater-utility"; + version = "2.31.0"; + + src = fetchFromGitHub { + owner = "mattpannella"; + repo = "${pname}"; + rev = "${version}"; + hash = "sha256-z90YITAW2Nv+Mq2q56As4PoHqGPEnvDUPH73bhz/xnw="; + }; + + buildInputs = [ + stdenv.cc.cc.lib + zlib + openssl + ]; + + # See https://github.com/NixOS/nixpkgs/pull/196648/commits/0fb17c04fe34ac45247d35a1e4e0521652d9c494 + patches = [ ./add-runtime-identifier.patch ]; + postPatch = '' + substituteInPlace pocket_updater.csproj \ + --replace @RuntimeIdentifier@ "${dotnetCorePackages.systemToDotnetRid targetPlatform.system}" + ''; + + projectFile = "pocket_updater.csproj"; + + nugetDeps = ./deps.nix; + + selfContainedBuild = true; + + executables = [ "pocket_updater" ]; + + dotnetFlags = [ + "-p:PackageRuntime=${dotnetCorePackages.systemToDotnetRid stdenv.hostPlatform.system}" + ]; + + dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-runtime = dotnetCorePackages.runtime_6_0; + + meta = with lib; { + homepage = "https://github.com/mattpannella/pocket-updater-utility"; + description = "Analogue Pocket Updater Utility"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ p-rintz ]; + mainProgram = "pocket_updater"; + }; +} diff --git a/pkgs/tools/games/pocket-updater-utility/deps.nix b/pkgs/tools/games/pocket-updater-utility/deps.nix new file mode 100644 index 00000000000..0e9f626012d --- /dev/null +++ b/pkgs/tools/games/pocket-updater-utility/deps.nix @@ -0,0 +1,9 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: [ + (fetchNuGet { pname = "CommandLineParser"; version = "2.9.1"; sha256 = "1sldkj8lakggn4hnyabjj1fppqh50fkdrr1k99d4gswpbk5kv582"; }) + (fetchNuGet { pname = "Crc32.NET"; version = "1.2.0"; sha256 = "0qaj3192k1vfji87zf50rhydn5mrzyzybrs2k4v7ap29k8i0vi5h"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.0"; sha256 = "1bc4ba8ahgk15m8k4nd7x406nhi0kwqzbgjk2dmw52ss553xz7iy"; }) +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b099b2d919a..af73720723c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1933,6 +1933,8 @@ with pkgs; pferd = callPackage ../tools/misc/pferd { }; + pocket-updater-utility = callPackage ../tools/games/pocket-updater-utility { }; + polygon-cli = callPackage ../tools/networking/polygon-cli { }; proycon-wayout = callPackage ../tools/wayland/proycon-wayout { };