backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-08-20 09:57:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Nix Package by adding shiggy as an Input.

Browse source
This commit is contained in:
Hadi Chokr 2026-03-18 16:02:43 +01:00
parent ee96c204de
commit c8efdf6a6b
2 changed files with 32 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
flake.lock
View file

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1772433332, "lastModified": 1773734432,
"narHash": "sha256-izhTDFKsg6KeVBxJS9EblGeQ8y+O8eCa6RcW874vxEc=", "narHash": "sha256-IF5ppUWh6gHGHYDbtVUyhwy/i7D261P7fWD1bPefOsw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cf59864ef8aa2e178cccedbe2c178185b0365705", "rev": "cda48547b432e8d3b18b4180ba07473762ec8558",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -18,7 +18,25 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs",
"shiggy": "shiggy"
}
},
"shiggy": {
"flake": false,
"locked": {
"lastModified": 1773545684,
"narHash": "sha256-NI2qw4nROLciRgVZW1CM68vLQbeLmQeqdZ/QxufL6d4=",
"owner": "4jcraft",
"repo": "shiggy",
"rev": "7adc6c47882409c31e4f2d66fbfabdf4a3a98fd1",
"type": "github"
},
"original": {
"owner": "4jcraft",
"ref": "main",
"repo": "shiggy",
"type": "github"
} }
} }
}, },

14
flake.nix
View file

@ -3,9 +3,13 @@
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
shiggy = {
url = "github:4jcraft/shiggy/main";
flake = false;
};
}; };
outputs = { self, nixpkgs, ... }: outputs = { self, nixpkgs, shiggy, ... }:
let let
allSystems = [ allSystems = [
"x86_64-linux" "x86_64-linux"
@ -13,7 +17,6 @@
"x86_64-darwin" "x86_64-darwin"
"aarch64-darwin" "aarch64-darwin"
]; ];
forAllSystems = f: nixpkgs.lib.genAttrs allSystems (system: f { forAllSystems = f: nixpkgs.lib.genAttrs allSystems (system: f {
pkgs = import nixpkgs { inherit system; }; pkgs = import nixpkgs { inherit system; };
}); });
@ -24,9 +27,13 @@
default = pkgs.clangStdenv.mkDerivation { default = pkgs.clangStdenv.mkDerivation {
pname = "4jcraft"; pname = "4jcraft";
version = "0.1.0"; version = "0.1.0";
src = ./.; src = ./.;
preConfigure = ''
mkdir -p subprojects/shiggy
cp -r ${shiggy}/. subprojects/shiggy/
'';
buildInputs = with pkgs; [ buildInputs = with pkgs; [
openssl.dev openssl.dev
libGL libGL
@ -47,7 +54,6 @@
installPhase = '' installPhase = ''
mkdir -p $out/share/4jcraft mkdir -p $out/share/4jcraft
cp -r Minecraft.Client/. $out/share/4jcraft/ cp -r Minecraft.Client/. $out/share/4jcraft/
mkdir -p $out/bin mkdir -p $out/bin
makeWrapper $out/share/4jcraft/Minecraft.Client \ makeWrapper $out/share/4jcraft/Minecraft.Client \
$out/bin/4jcraft \ $out/bin/4jcraft \