diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2015-12-08 15:21:41 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2015-12-08 15:21:58 +0100 |
| commit | 8d18e4c9f8387ee65ed85af3db59ff0dec513225 (patch) | |
| tree | 398ae59d41070dface05b95e398ca68482cf442a /pkgs/games | |
| parent | 9cc4bb7f4ca71da3b57014ba58404ba69a3bce9b (diff) | |
| download | nixlib-8d18e4c9f8387ee65ed85af3db59ff0dec513225.tar nixlib-8d18e4c9f8387ee65ed85af3db59ff0dec513225.tar.gz nixlib-8d18e4c9f8387ee65ed85af3db59ff0dec513225.tar.bz2 nixlib-8d18e4c9f8387ee65ed85af3db59ff0dec513225.tar.lz nixlib-8d18e4c9f8387ee65ed85af3db59ff0dec513225.tar.xz nixlib-8d18e4c9f8387ee65ed85af3db59ff0dec513225.tar.zst nixlib-8d18e4c9f8387ee65ed85af3db59ff0dec513225.zip | |
tpm thePenguinPachine: use pillow instead of pil
Was already broken, and still is.
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/thePenguinMachine/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
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" ''; |