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

Merge pull request #303 from silverhadch/nix-input

Browse source 
Fix Nix Package
This commit is contained in:
ffqq 2026-03-23 14:35:11 +03:00 committed by GitHub
parent 37dff30878 447c8e2571
commit b7b339f9b2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 140 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
flake.lock
View file

@ -1,12 +1,54 @@
{ {
"nodes": { "nodes": {
"4jlibs": {
"flake": false,
"locked": {
"lastModified": 1774012501,
"narHash": "sha256-NoM5LtKcU+3LFPVZUtep1L+hfZS6YSQ4P/xkJU/2NY4=",
"owner": "4jcraft",
"repo": "4jlibs",
"rev": "df5f4a1fc3288fdc021b3d8ee2abaed3083de460",
"type": "github"
},
"original": {
"owner": "4jcraft",
"ref": "main",
"repo": "4jlibs",
"type": "github"
}
},
"miniaudio": {
"flake": false,
"locked": {
"lastModified": 1740378702,
"narHash": "sha256-o/7sfBcrhyXEakccOAogQqm8dO4Szj1QSpaIHg6OSt4=",
"type": "tarball",
"url": "https://github.com/mackron/miniaudio/archive/refs/tags/0.11.22.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://github.com/mackron/miniaudio/archive/refs/tags/0.11.22.tar.gz"
}
},
"miniaudio-patch": {
"flake": false,
"locked": {
"narHash": "sha256-txCgaQ2r4134YVNJjw0oVG9yGGLxGvdLfXnB1j+DI/4=",
"type": "file",
"url": "https://wrapdb.mesonbuild.com/v2/miniaudio_0.11.22-2/get_patch"
},
"original": {
"type": "file",
"url": "https://wrapdb.mesonbuild.com/v2/miniaudio_0.11.22-2/get_patch"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1773734432, "lastModified": 1774106199,
"narHash": "sha256-IF5ppUWh6gHGHYDbtVUyhwy/i7D261P7fWD1bPefOsw=", "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cda48547b432e8d3b18b4180ba07473762ec8558", "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -18,8 +60,12 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"4jlibs": "4jlibs",
"miniaudio": "miniaudio",
"miniaudio-patch": "miniaudio-patch",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"shiggy": "shiggy" "shiggy": "shiggy",
"stb": "stb"
} }
}, },
"shiggy": { "shiggy": {
@ -38,6 +84,23 @@
"repo": "shiggy", "repo": "shiggy",
"type": "github" "type": "github"
} }
},
"stb": {
"flake": false,
"locked": {
"lastModified": 1773836560,
"narHash": "sha256-bRXN5YdVuSi9gzWn7UbCY+v6OSQdfWaUwrP1WWKrbks=",
"owner": "nothings",
"repo": "stb",
"rev": "28d546d5eb77d4585506a20480f4de2e706dff4c",
"type": "github"
},
"original": {
"owner": "nothings",
"ref": "master",
"repo": "stb",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

113
flake.nix
View file

@ -3,13 +3,30 @@
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
shiggy = { shiggy = {
url = "github:4jcraft/shiggy/main"; url = "github:4jcraft/shiggy/main";
flake = false; flake = false;
}; };
miniaudio = {
url = "https://github.com/mackron/miniaudio/archive/refs/tags/0.11.22.tar.gz";
flake = false;
};
miniaudio-patch = {
url = "https://wrapdb.mesonbuild.com/v2/miniaudio_0.11.22-2/get_patch";
flake = false;
};
"4jlibs" = {
url = "github:4jcraft/4jlibs/main";
flake = false;
};
stb = {
url = "github:nothings/stb/master";
flake = false;
};
}; };
outputs = { self, nixpkgs, shiggy, ... }: outputs = { self, nixpkgs, ... } @ inputs:
let let
allSystems = [ allSystems = [
"x86_64-linux" "x86_64-linux"
@ -22,50 +39,66 @@
}); });
in in
{ {
packages = forAllSystems ({ pkgs }: packages = forAllSystems ({ pkgs }: {
{ default = pkgs.clangStdenv.mkDerivation {
default = pkgs.clangStdenv.mkDerivation { pname = "4jcraft";
pname = "4jcraft"; version = "0.1.0";
version = "0.1.0"; src = ./.;
src = ./.;
preConfigure = '' dontUseCmakeConfigure = true;
mkdir -p subprojects/shiggy
cp -r ${shiggy}/. subprojects/shiggy/
'';
buildInputs = with pkgs; [ preConfigure = ''
openssl.dev cp -r ${inputs.shiggy} subprojects/shiggy
libGL cp -r ${inputs.miniaudio} subprojects/miniaudio
libGLU chmod -R u+w subprojects/miniaudio
SDL2 unzip ${inputs."miniaudio-patch"} -d /tmp/miniaudio-patch/
zlib cp -r /tmp/miniaudio-patch/*/. subprojects/miniaudio/
]; cat > subprojects/miniaudio.wrap <<'EOF'
[wrap-file]
directory = miniaudio
nativeBuildInputs = with pkgs; [ [provide]
lld dependency_names = miniaudio
meson EOF
ninja cp -r ${inputs."4jlibs"} subprojects/4jlibs
pkg-config cp -r ${inputs.stb} subprojects/stb
python3 chmod -R u+w subprojects/
makeWrapper cp subprojects/packagefiles/stb/meson.build subprojects/stb/meson.build
]; '';
installPhase = '' buildInputs = with pkgs; [
mkdir -p $out/share/4jcraft openssl.dev
cp -r Minecraft.Client/. $out/share/4jcraft/ libGL
mkdir -p $out/bin libGLU
makeWrapper $out/share/4jcraft/Minecraft.Client \ SDL2
$out/bin/4jcraft \ zlib
--run "cd $out/share/4jcraft" ];
'';
meta = { nativeBuildInputs = with pkgs; [
description = "4JCraft"; cmake
platforms = pkgs.lib.platforms.linux; lld
}; meson
ninja
pkg-config
python3
makeWrapper
unzip
];
installPhase = ''
mkdir -p $out/share/4jcraft
cp -r Minecraft.Client/. $out/share/4jcraft/
mkdir -p $out/bin
makeWrapper $out/share/4jcraft/Minecraft.Client \
$out/bin/4jcraft \
--run "cd $out/share/4jcraft"
'';
meta = {
description = "4JCraft";
platforms = pkgs.lib.platforms.linux;
}; };
} };
); });
}; };
} }