snowman: Drop qt4 variant

cc #33248
This commit is contained in:
Will Dietz 2018-01-14 14:56:17 -06:00
parent 67e8392383
commit 17453b2310
2 changed files with 3 additions and 9 deletions

View File

@ -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

View File

@ -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 { };