f3386ca · typeable/nixpkgs

git.iko.soy/typeable/nixpkgs

qt5: apply makeScope overrides to qtModule

qtModule was defined outside of addPackages, which caused it to use a self variable that isn't affected by updates using overrideScope. This caused overrides to qtbase to be incompletely applied. I also entirely removed the outer self variable to prevent it from being accidently used again.

commitf3386ca8cce32ed7ced59ea043543336d3249b72 authorBen Wolsieffer <benwolsieffer@gmail.com> dateSat 8 Jan 2022, 00:47 (5 years ago) parent068c0a5

3 files changed+45−51

compare with master

unifiedsplit

pkgs/development/libraries/qt-5/5.12/default.nix+15−17 pkgs/development/libraries/qt-5/5.14/default.nix+15−17 pkgs/development/libraries/qt-5/5.15/default.nix+15−17

pkgs/development/libraries/qt-5/5.12/default.nix+15−17

@@ -117,22 +117,22 @@ let

117117 qttools = [ ./qttools.patch ];

118118 };

119119

120− qtModule =

121− import ../qtModule.nix

122− {

123− inherit perl;

124− inherit lib;

125− # Use a variant of mkDerivation that does not include wrapQtApplications

126− # to avoid cyclic dependencies between Qt modules.

127− mkDerivation =

128− import ../mkDerivation.nix

129− { inherit lib; inherit debug; wrapQtAppsHook = null; }

130− stdenv.mkDerivation;

131− }

132− { inherit self srcs patches; };

133−

134120 addPackages = self: with self;

135121 let

122+ qtModule =

123+ import ../qtModule.nix

124+ {

125+ inherit perl;

126+ inherit lib;

127+ # Use a variant of mkDerivation that does not include wrapQtApplications

128+ # to avoid cyclic dependencies between Qt modules.

129+ mkDerivation =

130+ import ../mkDerivation.nix

131+ { inherit lib; inherit debug; wrapQtAppsHook = null; }

132+ stdenv.mkDerivation;

133+ }

134+ { inherit self srcs patches; };

135+

136136 callPackage = self.newScope { inherit qtCompatVersion qtModule srcs; };

137137 in {

138138

@@ -228,6 +228,4 @@ let

228228 } ../hooks/wrap-qt-apps-hook.sh;

229229 };

230230

231− self = lib.makeScope newScope addPackages;

232−

233−in self

231+in lib.makeScope newScope addPackages

pkgs/development/libraries/qt-5/5.14/default.nix+15−17

@@ -118,22 +118,22 @@ let

118118 qtwayland = [ ./qtwayland-libdrm-build.patch ];

119119 };

120120

121− qtModule =

122− import ../qtModule.nix

123− {

124− inherit perl;

125− inherit lib;

126− # Use a variant of mkDerivation that does not include wrapQtApplications

127− # to avoid cyclic dependencies between Qt modules.

128− mkDerivation =

129− import ../mkDerivation.nix

130− { inherit lib; inherit debug; wrapQtAppsHook = null; }

131− stdenv.mkDerivation;

132− }

133− { inherit self srcs patches; };

134−

135121 addPackages = self: with self;

136122 let

123+ qtModule =

124+ import ../qtModule.nix

125+ {

126+ inherit perl;

127+ inherit lib;

128+ # Use a variant of mkDerivation that does not include wrapQtApplications

129+ # to avoid cyclic dependencies between Qt modules.

130+ mkDerivation =

131+ import ../mkDerivation.nix

132+ { inherit lib; inherit debug; wrapQtAppsHook = null; }

133+ stdenv.mkDerivation;

134+ }

135+ { inherit self srcs patches; };

136+

137137 callPackage = self.newScope { inherit qtCompatVersion qtModule srcs; };

138138 in {

139139

@@ -228,6 +228,4 @@ let

228228 } ../hooks/wrap-qt-apps-hook.sh;

229229 };

230230

231− self = lib.makeScope newScope addPackages;

232−

233−in self

231+in lib.makeScope newScope addPackages

pkgs/development/libraries/qt-5/5.15/default.nix+15−17

@@ -80,22 +80,22 @@ let

8080 qttools = [ ./qttools.patch ];

8181 };

8282

83− qtModule =

84− import ../qtModule.nix

85− {

86− inherit perl;

87− inherit lib;

88− # Use a variant of mkDerivation that does not include wrapQtApplications

89− # to avoid cyclic dependencies between Qt modules.

90− mkDerivation =

91− import ../mkDerivation.nix

92− { inherit lib; inherit debug; wrapQtAppsHook = null; }

93− stdenv.mkDerivation;

94− }

95− { inherit self srcs patches; };

96−

9783 addPackages = self: with self;

9884 let

85+ qtModule =

86+ import ../qtModule.nix

87+ {

88+ inherit perl;

89+ inherit lib;

90+ # Use a variant of mkDerivation that does not include wrapQtApplications

91+ # to avoid cyclic dependencies between Qt modules.

92+ mkDerivation =

93+ import ../mkDerivation.nix

94+ { inherit lib; inherit debug; wrapQtAppsHook = null; }

95+ stdenv.mkDerivation;

96+ }

97+ { inherit self srcs patches; };

98+

9999 callPackage = self.newScope { inherit qtCompatVersion qtModule srcs; };

100100 in {

101101

@@ -192,6 +192,4 @@ let

192192 } ../hooks/wrap-qt-apps-hook.sh;

193193 };

194194

195− self = lib.makeScope newScope addPackages;

196−

197−in self

195+in lib.makeScope newScope addPackages