From b9331fbad9226b825f46c2f52db4528eb4e4b897 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 31 Oct 2021 10:59:30 -0500
Subject: [PATCH] qt515: consolidate extra package sources

---
 .../libraries/qt-5/5.15/default.nix           | 52 +------------------
 pkgs/development/libraries/qt-5/5.15/srcs.nix | 49 ++++++++++++++++-
 2 files changed, 50 insertions(+), 51 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix
index 1659dc51ae27..183311c5f18a 100644
--- a/pkgs/development/libraries/qt-5/5.15/default.nix
+++ b/pkgs/development/libraries/qt-5/5.15/default.nix
@@ -21,60 +21,12 @@ Check for any minor version changes.
 
 let
 
+  srcs = import ./srcs.nix { inherit lib fetchgit fetchFromGitHub; };
+
   qtCompatVersion = srcs.qtbase.version;
 
   stdenvActual = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv;
 
-  mirror = "https://download.qt.io";
-  srcs =
-    import ./srcs.nix { inherit lib fetchgit; }
-    // {
-      # qtwebkit does not have an official release tarball on the qt mirror and is
-      # mostly maintained by the community.
-      qtwebkit = rec {
-        src = fetchFromGitHub {
-          owner = "qt";
-          repo = "qtwebkit";
-          rev = "v${version}";
-          sha256 = "0x8rng96h19xirn7qkz3lydal6v4vn00bcl0s3brz36dfs0z8wpg";
-        };
-        version = "5.212.0-alpha4";
-      };
-      qtwebengine =
-        let
-          branchName = "5.15.6";
-          rev = "v${branchName}-lts";
-        in
-        {
-          version = "${branchName}-${lib.substring 0 7 rev}";
-
-          src = fetchgit {
-            url = "https://github.com/qt/qtwebengine.git";
-            sha256 = "17bw9yf04zmr9ck5jkrd435c8b03zpf937vn2nwgsr8p78wkg3kr";
-            inherit rev branchName;
-            fetchSubmodules = true;
-            leaveDotGit = true;
-            name = "qtwebengine-${lib.substring 0 7 rev}.tar.gz";
-            postFetch = ''
-              # remove submodule .git directory
-              rm -rf "$out/src/3rdparty/.git"
-
-              # compress to not exceed the 2GB output limit
-              # try to make a deterministic tarball
-              tar -I 'gzip -n' \
-                --sort=name \
-                --mtime=1970-01-01 \
-                --owner=root --group=root \
-                --numeric-owner --mode=go=rX,u+rw,a-s \
-                --transform='s@^@source/@' \
-                -cf temp  -C "$out" .
-              rm -r "$out"
-              mv temp "$out"
-            '';
-          };
-        };
-    };
-
   patches = {
     qtbase = lib.optionals stdenv.isDarwin [
       ./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs.nix b/pkgs/development/libraries/qt-5/5.15/srcs.nix
index 9527b8aa4071..e254912b6009 100644
--- a/pkgs/development/libraries/qt-5/5.15/srcs.nix
+++ b/pkgs/development/libraries/qt-5/5.15/srcs.nix
@@ -1,4 +1,4 @@
-{ lib, fetchgit }:
+{ lib, fetchgit, fetchFromGitHub }:
 
 let
   version = "5.15.3";
@@ -23,3 +23,50 @@ let
     };
 in
 lib.mapAttrs mk (lib.importJSON ./srcs-generated.json)
+// {
+  # qtwebkit does not have an official release tarball on the qt mirror and is
+  # mostly maintained by the community.
+  qtwebkit = rec {
+    src = fetchFromGitHub {
+      owner = "qt";
+      repo = "qtwebkit";
+      rev = "v${version}";
+      sha256 = "0x8rng96h19xirn7qkz3lydal6v4vn00bcl0s3brz36dfs0z8wpg";
+    };
+    version = "5.212.0-alpha4";
+  };
+
+  qtwebengine =
+    let
+      branchName = "5.15.6";
+      rev = "v${branchName}-lts";
+    in
+    {
+      version = "${branchName}-${lib.substring 0 7 rev}";
+
+      src = fetchgit {
+        url = "https://github.com/qt/qtwebengine.git";
+        sha256 = "17bw9yf04zmr9ck5jkrd435c8b03zpf937vn2nwgsr8p78wkg3kr";
+        inherit rev branchName;
+        fetchSubmodules = true;
+        leaveDotGit = true;
+        name = "qtwebengine-${lib.substring 0 7 rev}.tar.gz";
+        postFetch = ''
+          # remove submodule .git directory
+          rm -rf "$out/src/3rdparty/.git"
+
+          # compress to not exceed the 2GB output limit
+          # try to make a deterministic tarball
+          tar -I 'gzip -n' \
+            --sort=name \
+            --mtime=1970-01-01 \
+            --owner=root --group=root \
+            --numeric-owner --mode=go=rX,u+rw,a-s \
+            --transform='s@^@source/@' \
+            -cf temp  -C "$out" .
+          rm -r "$out"
+          mv temp "$out"
+        '';
+      };
+    };
+}