diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2019-06-19 20:41:49 +0200 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2019-07-03 22:20:18 +0200 |
| commit | 28f6abd7b3f8f4430db89113868017b60e4e6a40 (patch) | |
| tree | 4484b746a2730925939807291aba19a3c3079c43 /pkgs/development/libraries/vtk | |
| parent | 72f2e6dc7b92479ce7bfc116ec0234dd5c5c0e39 (diff) | |
| download | nixpkgs-28f6abd7b3f8f4430db89113868017b60e4e6a40.tar nixpkgs-28f6abd7b3f8f4430db89113868017b60e4e6a40.tar.gz nixpkgs-28f6abd7b3f8f4430db89113868017b60e4e6a40.tar.bz2 nixpkgs-28f6abd7b3f8f4430db89113868017b60e4e6a40.tar.lz nixpkgs-28f6abd7b3f8f4430db89113868017b60e4e6a40.tar.xz nixpkgs-28f6abd7b3f8f4430db89113868017b60e4e6a40.tar.zst nixpkgs-28f6abd7b3f8f4430db89113868017b60e4e6a40.zip | |
vtk: remove cf-private
Diffstat (limited to 'pkgs/development/libraries/vtk')
| -rw-r--r-- | pkgs/development/libraries/vtk/default.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index 9843b1289cf..e2a82b7adcd 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -2,7 +2,7 @@ , qtLib ? null # Darwin support , Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL -, ApplicationServices, CoreText, IOSurface, cf-private, ImageIO, xpc, libobjc }: +, ApplicationServices, CoreText, IOSurface, ImageIO, xpc, libobjc }: with stdenv.lib; @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { sha256 = "1hrjxkcvs3ap0bdhk90vymz5pgvxmg7q6sz8ab3wsyddbshr1abq"; }; - buildInputs = - if !stdenv.isDarwin - then [ cmake libGLU_combined libX11 xorgproto libXt ] ++ optional (qtLib != null) qtLib - else [ cmake qtLib xpc CoreServices DiskArbitration IOKit cf-private - CFNetwork Security ApplicationServices CoreText IOSurface ImageIO - OpenGL GLUT ]; - propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ Cocoa libobjc ]; + buildInputs = [ cmake ] + ++ optional (qtLib != null) qtLib + ++ optionals stdenv.isLinux [ libGLU_combined libX11 xorgproto libXt ] + ++ optionals stdenv.isDarwin [ xpc Cocoa CoreServices DiskArbitration IOKit + CFNetwork Security ApplicationServices CoreText + IOSurface ImageIO OpenGL GLUT ]; + propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ libobjc ]; preBuild = '' |