From ac35d9884bed0e39d6206a982b6e13e50b0484f4 Mon Sep 17 00:00:00 2001 From: wisut hantanong Date: Thu, 31 Aug 2017 21:02:11 +0700 Subject: [PATCH] pythonPackages.pyglet : move to separate expression --- .../python-modules/pyglet/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 24 +---------------- 2 files changed, 28 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/pyglet/default.nix diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix new file mode 100644 index 00000000000..8d5dd53f80a --- /dev/null +++ b/pkgs/development/python-modules/pyglet/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchPypi +, mesa, xorg, freetype, fontconfig}: + +buildPythonPackage rec { + version = "1.2.4"; + pname = "pyglet"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "9f62ffbbcf2b202d084bf158685e77d28b8f4f5f2738f4c5e63a947a07503445"; + }; + + patchPhase = let + libs = [ mesa xorg.libX11 freetype fontconfig ]; + paths = builtins.concatStringsSep "," (map (l: "\"${l}/lib\"") libs); + in "sed -i -e 's|directories\.extend.*lib[^]]*|&,${paths}|' pyglet/lib.py"; + + doCheck = false; + + meta = with stdenv.lib; { + homepage = "http://www.pyglet.org/"; + description = "A cross-platform windowing and multimedia library"; + license = licenses.bsd3; + platforms = platforms.mesaPlatforms; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9db0ff7da8d..c0748876922 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17790,29 +17790,7 @@ in { PyGithub = callPackage ../development/python-modules/pyGithub {}; - pyglet = buildPythonPackage rec { - name = "pyglet-${version}"; - version = "1.2.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pyglet/pyglet-${version}.tar.gz"; - sha256 = "9f62ffbbcf2b202d084bf158685e77d28b8f4f5f2738f4c5e63a947a07503445"; - }; - - patchPhase = let - libs = [ pkgs.mesa pkgs.xorg.libX11 pkgs.freetype pkgs.fontconfig ]; - paths = concatStringsSep "," (map (l: "\"${l}/lib\"") libs); - in "sed -i -e 's|directories\.extend.*lib[^]]*|&,${paths}|' pyglet/lib.py"; - - doCheck = false; - - meta = { - homepage = "http://www.pyglet.org/"; - description = "A cross-platform windowing and multimedia library"; - license = licenses.bsd3; - platforms = platforms.mesaPlatforms; - }; - }; + pyglet = callPackage ../development/python-modules/pyglet {}; pygments = callPackage ../development/python-modules/Pygments { };