alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Pull requests Activity

Merge pull request #207164 from SuperSandro2000/qtbase

Browse source 
qt5.qtbase: remove ? null asserts
This commit is contained in:
figsoda 2022-12-21 20:45:49 -05:00 • committed by GitHub
commit 0325df89b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/development/libraries/qt-5/modules/qtbase.nix
View file

@ -14,7 +14,7 @@
# optional dependencies # optional dependencies
, cups ? null, libmysqlclient ? null, postgresql ? null , cups ? null, libmysqlclient ? null, postgresql ? null
, withGtk3 ? false, dconf ? null, gtk3 ? null , withGtk3 ? false, dconf, gtk3
# options # options
, libGLSupported ? !stdenv.isDarwin , libGLSupported ? !stdenv.isDarwin
@ -26,9 +26,6 @@
, decryptSslTraffic ? false , decryptSslTraffic ? false
}: }:
assert withGtk3 -> dconf != null;
assert withGtk3 -> gtk3 != null;
let let
compareVersion = v: builtins.compareVersions version v; compareVersion = v: builtins.compareVersions version v;
qmakeCacheName = if compareVersion "5.12.4" < 0 then ".qmake.cache" else ".qmake.stash"; qmakeCacheName = if compareVersion "5.12.4" < 0 then ".qmake.cache" else ".qmake.stash";