qscintilla: cleanup of derivations

pkgs/development/libraries/qscintilla/default.nix

@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ qtbase ];
 
-  propagatedBuildInputs = lib.optional stdenv.isDarwin qtmacextras;
+  propagatedBuildInputs = lib.optionals stdenv.isDarwin [ qtmacextras ];
 
   nativeBuildInputs = [ unzip qmake ]
     ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;

pkgs/development/python-modules/qscintilla-qt5/default.nix

@@ -3,7 +3,7 @@
 , qscintilla
 , qtbase
 , qmake
-, qtmacextras ? null
+, qtmacextras
 , stdenv
 }:
 
@@ -19,7 +19,7 @@ in buildPythonPackage rec {
 
   nativeBuildInputs = [ sip qmake pyqt-builder qscintilla ];
   buildInputs = [ qtbase ];
-  propagatedBuildInputs = [ pyqt5 ] ++ lib.optional (stdenv.isDarwin) qtmacextras;
+  propagatedBuildInputs = [ pyqt5 ] ++ lib.optionals stdenv.isDarwin [ qtmacextras ];
 
   dontWrapQtApps = true;
 

pkgs/top-level/all-packages.nix

@@ -19494,17 +19494,17 @@ with pkgs;
     });
 
   libsForQt512 = recurseIntoAttrs (import ./qt5-packages.nix {
-    inherit lib pkgs stdenv;
+    inherit lib pkgs;
     qt5 = qt512;
   });
 
   libsForQt514 = recurseIntoAttrs (import ./qt5-packages.nix {
-    inherit lib pkgs stdenv;
+    inherit lib pkgs;
     qt5 = qt514;
   });
 
   libsForQt515 = recurseIntoAttrs (import ./qt5-packages.nix {
-    inherit lib pkgs stdenv;
+    inherit lib pkgs;
     qt5 = qt515;
   });