python.pkgs.rivet: add bindings for rivet

2017-11-11 13:54:42 +01:00 · 2017-11-11 13:54:42 +01:00 · 985f0ce15d
commit 985f0ce15d
parent 42eece04e4
2 changed files with 4 additions and 2 deletions
--- a/pkgs/development/libraries/physics/rivet/default.nix
+++ b/pkgs/development/libraries/physics/rivet/default.nix
@ -11,8 +11,6 @@ stdenv.mkDerivation rec {

  postPatch = "patchShebangs ./src/Analyses/cat_with_lines";

-  pythonPath = []; # python wrapper support
-
  patches = [
    ./darwin.patch # configure relies on impure sw_vers to -Dunix
  ];
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -17200,6 +17200,10 @@ in {

  readme_renderer = callPackage ../development/python-modules/readme_renderer { };

+  rivet = disabledIf isPy3k (toPythonModule (pkgs.rivet.override {
+    python2 = python;
+  }));
+
  rjsmin = callPackage ../development/python-modules/rjsmin { };

  pysolr = buildPythonPackage rec {