From 20ce363de43e45cc636c1bee04e0d97a424e08e7 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Mon, 30 Aug 2021 15:15:44 -0500
Subject: [PATCH] qt5: Expose internal variables to facilitate out-of-tree
 building of modules

As it is currently it's almost impossible to accomplish something like:
```nix
...

(qt5.callPackage (
  { qtModule, qtbase, qtdeclarative }:
  qtModule {
    pname = "qt3d";
    qtInputs = [ qtbase qtdeclarative ];
    outputs = [ "out" "dev" "bin" ];
  }
) { })

...
```
because all the required variables such as qtModule are internal-only.

By exposing these it's easier for external projects not to be bound
exactly by the module definitions explicitly listed in nixpkgs.
---
 pkgs/development/libraries/qt-5/5.12/default.nix | 2 ++
 pkgs/development/libraries/qt-5/5.14/default.nix | 2 ++
 pkgs/development/libraries/qt-5/5.15/default.nix | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix
index 680debc164f7..2e7029f71464 100644
--- a/pkgs/development/libraries/qt-5/5.12/default.nix
+++ b/pkgs/development/libraries/qt-5/5.12/default.nix
@@ -127,6 +127,8 @@ let
       callPackage = self.newScope { inherit qtCompatVersion qtModule srcs; };
     in {
 
+      inherit callPackage qtCompatVersion qtModule srcs;
+
       mkDerivationWith =
         import ../mkDerivation.nix
         { inherit lib; inherit debug; inherit (self) wrapQtAppsHook; };
diff --git a/pkgs/development/libraries/qt-5/5.14/default.nix b/pkgs/development/libraries/qt-5/5.14/default.nix
index eaf7998047f0..e74c91ecb5d3 100644
--- a/pkgs/development/libraries/qt-5/5.14/default.nix
+++ b/pkgs/development/libraries/qt-5/5.14/default.nix
@@ -139,6 +139,8 @@ let
       callPackage = self.newScope { inherit qtCompatVersion qtModule srcs; };
     in {
 
+      inherit callPackage qtCompatVersion qtModule srcs;
+
       mkDerivationWith =
         import ../mkDerivation.nix
         { inherit lib; inherit debug; inherit (self) wrapQtAppsHook; };
diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix
index 59c2c7048044..f696a66f67b9 100644
--- a/pkgs/development/libraries/qt-5/5.15/default.nix
+++ b/pkgs/development/libraries/qt-5/5.15/default.nix
@@ -165,6 +165,8 @@ let
       callPackage = self.newScope { inherit qtCompatVersion qtModule srcs; };
     in {
 
+      inherit callPackage qtCompatVersion qtModule srcs;
+
       mkDerivationWith =
         import ../mkDerivation.nix
         { inherit lib; inherit debug; inherit (self) wrapQtAppsHook; };