diff options
| author | Peter Hoeg <peter@hoeg.com> | 2017-10-14 14:00:42 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-14 14:00:42 +0800 |
| commit | 2fdfefa2da9fd2a2dd35d7aa00dfbc55ab0d5bcc (patch) | |
| tree | 0c771df24d829b42a29fcd25e46c65c8a7b1605b /pkgs/top-level | |
| parent | c46fa38c90af96bfd4ffda6091f538022f5ee7bf (diff) | |
| parent | b2c1020a682d124ea027da699149624eefc88525 (diff) | |
| download | nixpkgs-2fdfefa2da9fd2a2dd35d7aa00dfbc55ab0d5bcc.tar nixpkgs-2fdfefa2da9fd2a2dd35d7aa00dfbc55ab0d5bcc.tar.gz nixpkgs-2fdfefa2da9fd2a2dd35d7aa00dfbc55ab0d5bcc.tar.bz2 nixpkgs-2fdfefa2da9fd2a2dd35d7aa00dfbc55ab0d5bcc.tar.lz nixpkgs-2fdfefa2da9fd2a2dd35d7aa00dfbc55ab0d5bcc.tar.xz nixpkgs-2fdfefa2da9fd2a2dd35d7aa00dfbc55ab0d5bcc.tar.zst nixpkgs-2fdfefa2da9fd2a2dd35d7aa00dfbc55ab0d5bcc.zip | |
Merge pull request #30342 from acowley/pcl-qt5
pcl: qt4 -> qt5; 1.8.0 -> 1.8.1
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82b53964f13..67d619cf988 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10104,8 +10104,7 @@ with pkgs; pcg_c = callPackage ../development/libraries/pcg-c { }; - pcl = callPackage ../development/libraries/pcl { - vtk = vtkWithQt4; + pcl = libsForQt5.callPackage ../development/libraries/pcl { inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) Cocoa AGL OpenGL; }; |