diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2013-02-13 17:45:27 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2013-02-13 17:45:27 +0100 |
commit | 4c4e3f0ada5f876dd79703a7beafc01b24e7839d (patch) | |
tree | 5161e5c2fea22d8700d832c85e89c4e7daf058ab | |
parent | 17faab35c34859e4426873aacaa8d8d7dd795043 (diff) |
meshlab: fix forgotten qt47
-rw-r--r-- | pkgs/applications/graphics/meshlab/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index a811d759f7eb2..7151fc7af5c4b 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, qt, bzip2, lib3ds, levmar, muparser, unzip}: +{stdenv, fetchurl, qt4, bzip2, lib3ds, levmar, muparser, unzip}: stdenv.mkDerivation rec { name = "meshlab-1.3.2"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { sourceRoot = "."; - buildInputs = [ qt unzip ]; + buildInputs = [ qt4 unzip ]; meta = { description = "System for the processing and editing of unstructured 3D triangular meshes"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fbc7e31e0e369..72db87de9e9cd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7482,9 +7482,7 @@ let merkaartor = callPackage ../applications/misc/merkaartor { }; - meshlab = callPackage ../applications/graphics/meshlab { - qt = qt47; - }; + meshlab = callPackage ../applications/graphics/meshlab { }; mhwaveedit = callPackage ../applications/audio/mhwaveedit {}; |