Merge pull request #136232 from tweag/qt5-out-of-tree-modules

qt5: Expose internal variables to facilitate out-of-tree building of modules
2021-08-31 14:16:32 -05:00
parent d521df8494 20ce363de4
commit bcddcb26be
3 changed files with 6 additions and 0 deletions
@@ -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; };
@@ -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; };
@@ -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; };