openslide: Python portion into pythonPackages infrastructure

This commit is contained in:
Tyson Whitehead
2018-08-10 00:27:02 -04:00
parent 8f5981df31
commit d0a6a1bf3f
3 changed files with 6 additions and 5 deletions

View File

@@ -31,7 +31,6 @@ self: super: pkgs: with pkgs; {
openfoam = callPackage ./openfoam.nix { };
openslide = callPackage ./openslide { };
openslide-python = callPackage ./openslide/python.nix { pythonPackages = python27Packages; };
ovito = libsForQt5.callPackage ./ovito.nix { stdenv = overrideCC stdenv gcc6; };

View File

@@ -1,7 +1,8 @@
{ lib, fetchFromGitHub
, pythonPackages, openslide }:
{ lib, fetchFromGitHub, buildPythonPackage
, openslide
, pillow }:
pythonPackages.buildPythonPackage rec {
buildPythonPackage rec {
version = "1.1.1";
name = "openslide-python-${version}";
@@ -23,7 +24,7 @@ pythonPackages.buildPythonPackage rec {
];
propagatedBuildInputs = [
pythonPackages.pillow
pillow
];
meta = with lib; {

View File

@@ -1,3 +1,4 @@
pkgs: self: super: with self; {
openslide = callPackage ./openslide/python.nix { openslide = pkgs.openslide; };
}