Merge pull request #49864 from oxij/pkgs/tiny-things

trivial: tiny cleanups and fixes

pkgs/development/libraries/mesa/default.nix

@@ -25,20 +25,20 @@
 
 with stdenv.lib;
 
-if ! lists.elem stdenv.hostPlatform.system platforms.mesaPlatforms then
+if ! elem stdenv.hostPlatform.system platforms.mesaPlatforms then
   throw "unsupported platform for Mesa"
 else
 
 let
   defaultGalliumDrivers =
-    optionals (builtins.elem "drm" eglPlatforms)
+    optionals (elem "drm" eglPlatforms)
     (if stdenv.isAarch32
     then ["virgl" "nouveau" "freedreno" "vc4" "etnaviv" "imx"]
     else if stdenv.isAarch64
     then ["virgl" "nouveau" "vc4" ]
     else ["virgl" "svga" "i915" "r300" "r600" "radeonsi" "nouveau"]);
   defaultDriDrivers =
-    optionals (builtins.elem "drm" eglPlatforms)
+    optionals (elem "drm" eglPlatforms)
     (if (stdenv.isAarch32 || stdenv.isAarch64)
     then ["nouveau"]
     else ["i915" "i965" "nouveau" "radeon" "r200"]);

pkgs/development/libraries/qt-5/5.11/default.nix

@@ -33,7 +33,7 @@ let
 
   qtCompatVersion = "5.11";
 
-  mirror = "http://download.qt.io";
+  mirror = "https://download.qt.io";
   srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; } // {
     # Community port of the now unmaintained upstream qtwebkit.
     qtwebkit = {

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

@@ -18,7 +18,7 @@
   withGtk3 ? false, dconf ? null, gtk3 ? null,
 
   # options
-  libGLSupported ? (!stdenv.isDarwin),
+  libGLSupported ? !stdenv.isDarwin,
   libGL,
   buildExamples ? false,
   buildTests ? false,