Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-08-16 07:54:01 +00:00
parent 1747d28e5a 888efed972
commit 33e1c78ae3
139 changed files with 1301 additions and 1116 deletions
--- a/pkgs/development/interpreters/renpy/default.nix
+++ b/pkgs/development/interpreters/renpy/default.nix
@@ -1,7 +1,9 @@
-{ stdenv, fetchurl, python, cython, pkgconfig, wrapPython
-, pygame, SDL, libpng, ffmpeg, freetype, glew, mesa, fribidi, zlib
+{ stdenv, fetchurl, pythonPackages, pkgconfig, SDL
+, libpng, ffmpeg, freetype, glew, mesa, fribidi, zlib
 }:

+with pythonPackages;
+
 stdenv.mkDerivation {
  name = "renpy-6.17.6";