diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2016-04-09 11:51:15 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2016-04-09 11:51:15 +0200 |
| commit | dddafe61ebcb3ab347a6e34c2b00449081d5be24 (patch) | |
| tree | 97bed7d01633fdfa4514bb87c834774ed8b620e7 /pkgs | |
| parent | 7da3bba260a32a2375aeade12fcea14df67db4c0 (diff) | |
| parent | 2be0505b8df56a65e5b19910e3133fd41d5666b7 (diff) | |
| download | nixlib-dddafe61ebcb3ab347a6e34c2b00449081d5be24.tar nixlib-dddafe61ebcb3ab347a6e34c2b00449081d5be24.tar.gz nixlib-dddafe61ebcb3ab347a6e34c2b00449081d5be24.tar.bz2 nixlib-dddafe61ebcb3ab347a6e34c2b00449081d5be24.tar.lz nixlib-dddafe61ebcb3ab347a6e34c2b00449081d5be24.tar.xz nixlib-dddafe61ebcb3ab347a6e34c2b00449081d5be24.tar.zst nixlib-dddafe61ebcb3ab347a6e34c2b00449081d5be24.zip | |
Merge pull request #14498 from expipiplus1/python-cgkit
pythonPackages.cgkit: init at 2.0.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/python-modules/cgkit/scons-env.patch | 22 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 27 |
2 files changed, 49 insertions, 0 deletions
diff --git a/pkgs/development/python-modules/cgkit/scons-env.patch b/pkgs/development/python-modules/cgkit/scons-env.patch new file mode 100644 index 000000000000..65e9d58a0ae4 --- /dev/null +++ b/pkgs/development/python-modules/cgkit/scons-env.patch @@ -0,0 +1,22 @@ +diff --git a/supportlib/SConstruct b/supportlib/SConstruct +index 7f797b9..07907e9 100644 +--- a/supportlib/SConstruct ++++ b/supportlib/SConstruct +@@ -5,7 +5,7 @@ + # library. + ###################################################################### + +-import sys, glob, os.path ++import sys, glob, os.path, os + + # Read the options + vars = Variables("cpp_config.cfg") +@@ -16,7 +16,7 @@ vars.Add("CPPPATH", "The include directories", []) + vars.Add("MSVS_VERSION", "The preferred version of MS Visual Studio") + + # Create the construction environment +-env = Environment(variables = vars) ++env = Environment(variables = vars, ENV = os.environ) + + # Build the files in "obj" + env.VariantDir("obj", "src", duplicate=0) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5a02c0246e6c..c49debcdeaa1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3024,6 +3024,33 @@ in modules // { }; }; + # This package is no longer actively maintained and can be removed if it becomes broken. + cgkit = buildPythonPackage rec { + version = "2.0.0"; + name = "cgkit-${version}"; + disabled = isPy3k; + + src = pkgs.fetchurl { + url = "http://downloads.sourceforge.net/project/cgkit/cgkit/cgkit-${version}/cgkit-${version}-py2k.tar.gz"; + sha256 = "0vvllc42mdyma3c7yqhahs4bfxymm2kvmc4va7dxqr5x0rzh6rd6"; + }; + + patches = [ ../development/python-modules/cgkit/scons-env.patch ]; + + buildInputs = with pkgs; [ scons boost mesa ]; + + preBuild = '' + cd supportlib + scons + cd - + ''; + + meta = { + homepage = http://cgkit.sourceforge.net; + description = "Python Computer Graphics Kit"; + maintainers = with maintainers; [ expipiplus1 ]; + }; + }; cheetah = buildPythonPackage rec { version = "2.4.4"; |