diff --git a/pkgs/applications/office/impressive/default.nix b/pkgs/applications/office/impressive/default.nix index 1c921925cea..1422369d20e 100644 --- a/pkgs/applications/office/impressive/default.nix +++ b/pkgs/applications/office/impressive/default.nix @@ -1,10 +1,10 @@ -{ fetchurl, stdenv, python, makeWrapper, lib -, xpdf, pillow, pyopengl, pygame -, setuptools, mesa, freeglut }: +{ fetchurl, stdenv, pythonPackages, makeWrapper, lib +, xpdf, mesa, freeglut }: -let version = "0.10.5"; -in - stdenv.mkDerivation { +let + inherit (pythonPackages) python pyopengl pygame setuptools pillow; + version = "0.10.5"; +in stdenv.mkDerivation { # This project was formerly known as KeyJNote. # See http://keyj.s2000.ws/?p=77 for details. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e59f1f222c..283bfccce4c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10065,8 +10065,6 @@ in pyexiv2 = pythonPackages.pyexiv2; - pygame = pythonPackages.pygame; - pygobject = pythonPackages.pygobject; pygobject3 = pythonPackages.pygobject3; @@ -13556,11 +13554,7 @@ in imagemagickBig = callPackage ../applications/graphics/ImageMagick { }; # Impressive, formerly known as "KeyJNote". - impressive = callPackage ../applications/office/impressive { - # XXX These are the PyOpenGL dependencies, which we need here. - inherit (pythonPackages) pyopengl; - inherit (pythonPackages) pillow; - }; + impressive = callPackage ../applications/office/impressive { }; inferno = callPackage_i686 ../applications/inferno { };