ar/nibylandia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

crimes

Browse source
This commit is contained in:
Ari Gato 2024-07-11 23:51:49 +02:00
parent 1f5837978a
commit b5eecf97f6
3 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/zorigami/default.nix
View file

@ -137,8 +137,8 @@
systemd.services.minecraft-overviewer = {
script = ''
${pkgs.python3Packages.minecraft-overviewer}/bin/overviewer.py -p 12 -c "/srv/minecraft-overviewer/survival/config.py"
${pkgs.python3Packages.minecraft-overviewer}/bin/overviewer.py -p 12 -c "/srv/minecraft-overviewer/survival/config.py" --genpoi
${pkgs.python311Packages.minecraft-overviewer}/bin/overviewer.py -p 12 -c "/srv/minecraft-overviewer/survival/config.py"
${pkgs.python311Packages.minecraft-overviewer}/bin/overviewer.py -p 12 -c "/srv/minecraft-overviewer/survival/config.py" --genpoi
'';
serviceConfig = {
User = "minecraft";

4
overlays/nibylandia.nix
View file

@ -21,7 +21,7 @@ in {
inherit (emoji-reactions) patches;
};
python3 = super.python3.override {
python311 = super.python311.override {
packageOverrides = self: super: {
pillow_with_headers =
self.callPackage ../pkgs/pillow-with-headers.nix { };
@ -29,5 +29,5 @@ in {
self.callPackage ../pkgs/minecraft-overviewer.nix { };
};
};
python3Packages = self.python3.pkgs;
python311Packages = self.python311.pkgs;
}

17
pkgs/minecraft-overviewer.nix
View file

@ -1,12 +1,21 @@
{ fetchFromGitHub, pkgs, buildPythonPackage, python3Packages, python3, ... }:
{ callPackage, fetchFromGitHub, pkgs, buildPythonPackage, python311, pythonOlder, ... }:
let
python3 = python311;
python3Packages = pkgs.python311Packages;
pillow_with_headers = callPackage ./pillow-with-headers.nix {
inherit python3Packages;
};
in
buildPythonPackage {
pname = "Minecraft-Overviewer";
version = "2024-03-15";
format = "other";
propagatedBuildInputs = [ pkgs.pipreqs ] ++ (with python3Packages; [
propagatedBuildInputs = [
(pkgs.pipreqs.override { inherit python3; })
pillow_with_headers
] ++ (with python3Packages; [
altgraph
certifi
charset-normalizer
@ -26,7 +35,7 @@ buildPythonPackage {
buildInputs = with python3Packages; [ setuptools ];
buildPhase = ''
export CFLAGS="-I${python3Packages.pillow_with_headers}/include/libImaging"
export CFLAGS="-I${pillow_with_headers}/include/libImaging"
${python3.interpreter} setup.py build
'';
@ -34,6 +43,8 @@ buildPythonPackage {
${python3.interpreter} setup.py install --prefix=$out --install-lib=$out/${python3.sitePackages}
'';
doCheck = pythonOlder "3.12";
src = fetchFromGitHub {
owner = "GregoryAM-SP";
repo = "The-Minecraft-Overviewer";