diff --git a/pkgs/games/thePenguinMachine/default.nix b/pkgs/games/thePenguinMachine/default.nix index 479004a9af4d..934b712fe121 100644 --- a/pkgs/games/thePenguinMachine/default.nix +++ b/pkgs/games/thePenguinMachine/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, python, pil, pygame, SDL} @ args: with args; +{stdenv, fetchurl, python, pillow, pygame, SDL} @ args: with args; stdenv.mkDerivation { name = "thePenguinMachine"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { broken = true; # Not found - buildInputs = [python pil pygame SDL]; + buildInputs = [python pillow pygame SDL]; configurePhase = '' sed -e "/includes = /aincludes.append('${SDL}/include/SDL')" -i setup.py; @@ -32,9 +32,9 @@ stdenv.mkDerivation { cp -r . "$out"/share/tpm/build-dir mkdir -p "$out/bin" echo "#! /bin/sh" >> "$out/bin/tpm" - echo "export PYTHONPATH=\"\$PYTHONPATH:$PYTHONPATH:$(echo ${pil}/lib/python*/site-packages/PIL)\"" >> "$out/bin/tpm" + echo "export PYTHONPATH=\"\$PYTHONPATH:$PYTHONPATH:$(echo ${pillow}/lib/python*/site-packages/PIL)\"" >> "$out/bin/tpm" echo "cd \"$out/share/tpm/build-dir\"" >> "$out/bin/tpm" - echo "export PYTHONPATH=\"\$PYTHONPATH:$PYTHONPATH:$(echo ${pil}/lib/python*/site-packages/PIL)\"" >> "$out/bin/tpm" + echo "export PYTHONPATH=\"\$PYTHONPATH:$PYTHONPATH:$(echo ${pillow}/lib/python*/site-packages/PIL)\"" >> "$out/bin/tpm" echo "${python}/bin/python \"$out\"/share/tpm/build-dir/ThePenguinMachine.py \"\$@\"" >> "$out/bin/tpm" chmod a+x "$out/bin/tpm" ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ccf0241cee55..dd2f0130e886 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14223,7 +14223,9 @@ let tome4 = callPackage ../games/tome4 { }; - tpm = callPackage ../games/thePenguinMachine { }; + tpm = callPackage ../games/thePenguinMachine { + inherit (pythonPackages) pillow; + }; trackballs = callPackage ../games/trackballs { debug = false;