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

Remove top-level pygame

Browse Source 
See #11567.
This commit is contained in:
Frederik Rietdijk 2016-08-14 12:48:17 +02:00
parent a00978675e
commit b6452f8534
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/office/impressive/default.nix
View File

@ -1,10 +1,10 @@
{ fetchurl, stdenv, python, makeWrapper, lib { fetchurl, stdenv, pythonPackages, makeWrapper, lib
, xpdf, pillow, pyopengl, pygame , xpdf, mesa, freeglut }:
, setuptools, mesa, freeglut }:
let version = "0.10.5"; let
in inherit (pythonPackages) python pyopengl pygame setuptools pillow;
stdenv.mkDerivation { version = "0.10.5";
in stdenv.mkDerivation {
# This project was formerly known as KeyJNote. # This project was formerly known as KeyJNote.
# See http://keyj.s2000.ws/?p=77 for details. # See http://keyj.s2000.ws/?p=77 for details.

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

@ -10065,8 +10065,6 @@ in
pyexiv2 = pythonPackages.pyexiv2; pyexiv2 = pythonPackages.pyexiv2;
pygame = pythonPackages.pygame;
pygobject = pythonPackages.pygobject; pygobject = pythonPackages.pygobject;
pygobject3 = pythonPackages.pygobject3; pygobject3 = pythonPackages.pygobject3;
@ -13556,11 +13554,7 @@ in
imagemagickBig = callPackage ../applications/graphics/ImageMagick { }; imagemagickBig = callPackage ../applications/graphics/ImageMagick { };
# Impressive, formerly known as "KeyJNote". # Impressive, formerly known as "KeyJNote".
impressive = callPackage ../applications/office/impressive { impressive = callPackage ../applications/office/impressive { };
# XXX These are the PyOpenGL dependencies, which we need here.
inherit (pythonPackages) pyopengl;
inherit (pythonPackages) pillow;
};
inferno = callPackage_i686 ../applications/inferno { }; inferno = callPackage_i686 ../applications/inferno { };