JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tpm thePenguinPachine: use pillow instead of pil

Browse Source 
Was already broken, and still is.
This commit is contained in:
Frederik Rietdijk 2015-12-08 15:21:41 +01:00
parent 9cc4bb7f4c
commit 8d18e4c9f8
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/games/thePenguinMachine/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, python, pil, pygame, SDL} @ args: with args; {stdenv, fetchurl, python, pillow, pygame, SDL} @ args: with args;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "thePenguinMachine"; name = "thePenguinMachine";
@ -9,7 +9,7 @@ stdenv.mkDerivation {
broken = true; # Not found broken = true; # Not found
buildInputs = [python pil pygame SDL]; buildInputs = [python pillow pygame SDL];
configurePhase = '' configurePhase = ''
sed -e "/includes = /aincludes.append('${SDL}/include/SDL')" -i setup.py; sed -e "/includes = /aincludes.append('${SDL}/include/SDL')" -i setup.py;
@ -32,9 +32,9 @@ stdenv.mkDerivation {
cp -r . "$out"/share/tpm/build-dir cp -r . "$out"/share/tpm/build-dir
mkdir -p "$out/bin" mkdir -p "$out/bin"
echo "#! /bin/sh" >> "$out/bin/tpm" 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 "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" echo "${python}/bin/python \"$out\"/share/tpm/build-dir/ThePenguinMachine.py \"\$@\"" >> "$out/bin/tpm"
chmod a+x "$out/bin/tpm" chmod a+x "$out/bin/tpm"
''; '';

4
pkgs/top-level/all-packages.nix
View File

@ -14223,7 +14223,9 @@ let
tome4 = callPackage ../games/tome4 { }; tome4 = callPackage ../games/tome4 { };
tpm = callPackage ../games/thePenguinMachine { }; tpm = callPackage ../games/thePenguinMachine {
inherit (pythonPackages) pillow;
};
trackballs = callPackage ../games/trackballs { trackballs = callPackage ../games/trackballs {
debug = false; debug = false;