public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #33868 from dtzWill/snowman-deprecate-qt4 

snowman: deprecate qt4 variant
This commit is contained in:
adisbladis 2018-01-15 09:37:35 +08:00 committed by GitHub
parent 554104e6b9 17453b2310
commit 9af3b9d7b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/tools/analysis/snowman/default.nix
View File

@ -1,8 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, boost, qt4 ? null, qtbase ? null }: { stdenv, fetchFromGitHub, cmake, boost, qtbase }:
# Only one qt
assert qt4 != null -> qtbase == null;
assert qtbase != null -> qt4 == null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "snowman-${version}"; name = "snowman-${version}";
@ -17,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ boost qt4 qtbase ]; buildInputs = [ boost qtbase ];
postUnpack = '' postUnpack = ''
export sourceRoot=$sourceRoot/src export sourceRoot=$sourceRoot/src

4
pkgs/top-level/all-packages.nix
View File

@ -7868,9 +7868,7 @@ with pkgs;
smc = callPackage ../tools/misc/smc { }; smc = callPackage ../tools/misc/smc { };
snowman_qt4 = callPackage ../development/tools/analysis/snowman { }; snowman = qt5.callPackage ../development/tools/analysis/snowman { };
snowman_qt5 = qt5.callPackage ../development/tools/analysis/snowman { qt4 = null; };
snowman = snowman_qt5;
sparse = callPackage ../development/tools/analysis/sparse { }; sparse = callPackage ../development/tools/analysis/sparse { };