From 2b7235f3e62ce17038b83898c020dd62a75b78d4 Mon Sep 17 00:00:00 2001 From: Kristian Krsnik Date: Mon, 5 Feb 2024 22:02:12 +0100 Subject: [PATCH] Installed PolyMC Appimage because the official Flake did not work --- flake.lock | 29 +++++++++++++++++++++++++---- flake.nix | 10 ++++++++++ systems/common/packages.nix | 1 + 3 files changed, 36 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 2bb5e48..a83304a 100644 --- a/flake.lock +++ b/flake.lock @@ -323,6 +323,26 @@ "type": "github" } }, + "polymc": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1707167684, + "narHash": "sha256-9FJG9FxV0IUL7VzgHMGxpY6N5RRMNWeu1veK5NAJ4BE=", + "ref": "refs/heads/main", + "rev": "298c986d3e99ce408cc8fd8194b118e45b52e029", + "revCount": 2, + "type": "git", + "url": "https://git.krsnik.at/Kristian/polymc-flake.git" + }, + "original": { + "type": "git", + "url": "https://git.krsnik.at/Kristian/polymc-flake.git" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_3", @@ -359,6 +379,7 @@ "nixpkgs-master": "nixpkgs-master", "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur", + "polymc": "polymc", "scanned-image-extractor": "scanned-image-extractor", "starc": "starc", "vscode-extensions": "vscode-extensions", @@ -373,11 +394,11 @@ ] }, "locked": { - "lastModified": 1706818288, - "narHash": "sha256-QpIHjA+z83IeRQjxQr+I7/sRirF5WFgN2RvVZR1sCDg=", + "lastModified": 1707062143, + "narHash": "sha256-mBBcq5hiojN3Kj3gPIC8hLBvCZd3h80Qm8yp/F8wivk=", "ref": "refs/heads/main", - "rev": "eeb1cd6647500c452af2db570c45008583691743", - "revCount": 8, + "rev": "8759413a66691de582761a89f31c87da9852e90f", + "revCount": 9, "type": "git", "url": "https://git.krsnik.at/Kristian/scanned-image-extractor.git" }, diff --git a/flake.nix b/flake.nix index acc9abb..ffbb7dc 100644 --- a/flake.nix +++ b/flake.nix @@ -36,6 +36,14 @@ url = "git+https://git.krsnik.at/Kristian/scanned-image-extractor.git"; inputs.nixpkgs.follows = "nixpkgs"; }; + + # polymc = { + # url = "github:PolyMC/PolyMC"; + # }; + polymc = { + url = "git+https://git.krsnik.at/Kristian/polymc-flake.git"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { @@ -50,6 +58,7 @@ vscode-extensions, starc, scanned-image-extractor, + polymc, }: let system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; @@ -87,6 +96,7 @@ # own programs starc = starc.packages.${system}.default; scanned-image-extractor = scanned-image-extractor.packages.${system}.default; + polymc = polymc.packages.${system}.default; } ) ( # Overrides davinci-resolve with the unstable version because of https://github.com/NixOS/nixpkgs/pull/246074 diff --git a/systems/common/packages.nix b/systems/common/packages.nix index b7d89b4..6b3844a 100644 --- a/systems/common/packages.nix +++ b/systems/common/packages.nix @@ -40,6 +40,7 @@ lutris osu-lazer r2modman + polymc # Communication webcord