diff options
| author | adisbladis <adisbladis@gmail.com> | 2018-01-15 09:37:35 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-15 09:37:35 +0800 |
| commit | 9af3b9d7b284ca0e9d504eb06c0d83640b9404b8 (patch) | |
| tree | eaa1e55c19c28c148481e55de4d1af76f0cdcb7d /pkgs | |
| parent | 554104e6b913a1c606b61cc13195ffc1b8672fbf (diff) | |
| parent | 17453b2310419d4afdb30bf06712be9b6cdacc56 (diff) | |
| download | nixpkgs-9af3b9d7b284ca0e9d504eb06c0d83640b9404b8.tar nixpkgs-9af3b9d7b284ca0e9d504eb06c0d83640b9404b8.tar.gz nixpkgs-9af3b9d7b284ca0e9d504eb06c0d83640b9404b8.tar.bz2 nixpkgs-9af3b9d7b284ca0e9d504eb06c0d83640b9404b8.tar.lz nixpkgs-9af3b9d7b284ca0e9d504eb06c0d83640b9404b8.tar.xz nixpkgs-9af3b9d7b284ca0e9d504eb06c0d83640b9404b8.tar.zst nixpkgs-9af3b9d7b284ca0e9d504eb06c0d83640b9404b8.zip | |
Merge pull request #33868 from dtzWill/snowman-deprecate-qt4
snowman: deprecate qt4 variant
Diffstat (limited to 'pkgs')
| -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 907e44420e9..fba7d3d5cd4 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 6811c2a13d8..1ad77d0f98a 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 { }; |