qscintilla, python3Packages.qscintilla-qt5: syntax

- Cleanup top-level package calls to remove unnecessary darwin
  logic and inherit statements
- Remove unnecessary let blocks in qscintilla and qscintilla-qt4
- Remove mention of withQt5

2 files changed, 3 insertions, 9 deletions

diff --git a/pkgs/development/libraries/qscintilla-qt4/default.nix b/pkgs/development/libraries/qscintilla-qt4/default.nix
index c74a9b9d1900a..7cefdec97ca24 100644
--- a/pkgs/development/libraries/qscintilla-qt4/default.nix
+++ b/pkgs/development/libraries/qscintilla-qt4/default.nix
@@ -1,13 +1,10 @@
 { stdenv, lib, fetchurl, unzip, qt4, qmake4Hook
 }:
 
-let
+stdenv.mkDerivation rec {
   pname = "qscintilla-qt4";
   version = "2.11.6";
 
-in stdenv.mkDerivation rec {
-  inherit pname version;
-
   src = fetchurl {
     url = "https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla-${version}.tar.gz";
     sha256 = "5zRgV9tH0vs4RGf6/M/LE6oHQTc8XVk7xytVsvDdIKc=";
diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix
index bebe637be9b56..332d61c1c4a30 100644
--- a/pkgs/development/libraries/qscintilla/default.nix
+++ b/pkgs/development/libraries/qscintilla/default.nix
@@ -1,16 +1,13 @@
 { stdenv, lib, fetchurl, unzip
-, withQt5 ? true, qtbase, qtmacextras ? null
+, qtbase, qtmacextras
 , qmake
 , fixDarwinDylibNames
 }:
 
-let
+stdenv.mkDerivation rec {
   pname = "qscintilla-qt5";
   version = "2.13.1";
 
-in stdenv.mkDerivation rec {
-  inherit pname version;
-
   src = fetchurl {
     url = "https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla_src-${version}.tar.gz";
     sha256 = "gA49IHGpa8zNdYE0avDS/ij8MM1oUwy4MCaF0BOv1Uo=";