diff options
| -rw-r--r-- | pkgs/development/tools/analysis/snowman/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 3 insertions, 9 deletions
diff --git a/pkgs/development/tools/analysis/snowman/default.nix b/pkgs/development/tools/analysis/snowman/default.nix index 907e44420e951..fba7d3d5cd410 100644 --- a/pkgs/development/tools/analysis/snowman/default.nix +++ b/pkgs/development/tools/analysis/snowman/default.nix @@ -1,8 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, boost, qt4 ? null, qtbase ? null }: - -# Only one qt -assert qt4 != null -> qtbase == null; -assert qtbase != null -> qt4 == null; +{ stdenv, fetchFromGitHub, cmake, boost, qtbase }: stdenv.mkDerivation rec { name = "snowman-${version}"; @@ -17,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ boost qt4 qtbase ]; + buildInputs = [ boost qtbase ]; postUnpack = '' export sourceRoot=$sourceRoot/src diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f456165d2311..2cd9fbd38b65f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7868,9 +7868,7 @@ with pkgs; smc = callPackage ../tools/misc/smc { }; - snowman_qt4 = callPackage ../development/tools/analysis/snowman { }; - snowman_qt5 = qt5.callPackage ../development/tools/analysis/snowman { qt4 = null; }; - snowman = snowman_qt5; + snowman = qt5.callPackage ../development/tools/analysis/snowman { }; sparse = callPackage ../development/tools/analysis/sparse { }; |