From 8d18e4c9f8387ee65ed85af3db59ff0dec513225 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 8 Dec 2015 15:21:41 +0100
Subject: [PATCH] tpm thePenguinPachine: use pillow instead of pil

Was already broken, and still is.
---
 pkgs/games/thePenguinMachine/default.nix | 8 ++++----
 pkgs/top-level/all-packages.nix          | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/games/thePenguinMachine/default.nix b/pkgs/games/thePenguinMachine/default.nix
index 479004a9af4..934b712fe12 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 ccf0241cee5..dd2f0130e88 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;