Syzygial/ccpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openslide: Python portion into pythonPackages infrastructure

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/all-packages.nix
View File

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

9
pkgs/openslide/python.nix
View File

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

1
pkgs/python-packages.nix
View File

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