From b8504e9b84e2dcd7cfed69b291b532913197bfb8 Mon Sep 17 00:00:00 2001
From: Will Cohen <willcohen@users.noreply.github.com>
Date: Thu, 6 Jan 2022 08:30:39 -0500
Subject: [PATCH] qscintilla: cleanup of derivations

---
 pkgs/development/libraries/qscintilla/default.nix          | 2 +-
 pkgs/development/python-modules/qscintilla-qt5/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                            | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix
index 332d61c1c4a3..3dcbc22e15fe 100644
--- a/pkgs/development/libraries/qscintilla/default.nix
+++ b/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;
diff --git a/pkgs/development/python-modules/qscintilla-qt5/default.nix b/pkgs/development/python-modules/qscintilla-qt5/default.nix
index afc684b3b0e8..11445c99f4f4 100644
--- a/pkgs/development/python-modules/qscintilla-qt5/default.nix
+++ b/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;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 19b7b1dbd0b6..f2f02bebef2d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/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;
   });