Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

qt5: fix splicing

and simplify some things

remove now unnecessary use of buildPackages

Artturin 19e04743 6b6bb56d

+19 -32
+15 -24
pkgs/development/libraries/qt-5/5.15/default.nix
··· 12 , bison, cups ? null, harfbuzz, libGL, perl, python3 13 , gstreamer, gst-plugins-base, gtk3, dconf 14 , darwin 15 - , buildPackages 16 17 # options 18 , developerBuild ? false ··· 204 205 addPackages = self: with self; 206 let 207 - qtModule = 208 - import ../qtModule.nix 209 - { 210 - inherit perl; 211 - inherit lib; 212 - # Use a variant of mkDerivation that does not include wrapQtApplications 213 - # to avoid cyclic dependencies between Qt modules. 214 - mkDerivation = 215 - import ../mkDerivation.nix 216 - { inherit lib; inherit debug; wrapQtAppsHook = null; } 217 - stdenv.mkDerivation; 218 - } 219 - { inherit self srcs patches; }; 220 221 callPackage = self.newScope { inherit qtCompatVersion qtModule srcs stdenv; }; 222 in { 223 224 inherit callPackage qtCompatVersion qtModule srcs; 225 226 - mkDerivationWith = 227 - import ../mkDerivation.nix 228 - { inherit lib; inherit debug; inherit (self) wrapQtAppsHook; }; 229 230 mkDerivation = mkDerivationWith stdenv.mkDerivation; 231 ··· 318 ] ++ lib.optional (!stdenv.isDarwin) qtwayland 319 ++ lib.optional (stdenv.isDarwin) qtmacextras); 320 321 - qmake = makeSetupHook { 322 name = "qmake-hook"; 323 - propagatedBuildInputs = [ self.qtbase.dev ]; 324 substitutions = { 325 inherit debug; 326 fix_qmake_libtool = ../hooks/fix-qmake-libtool.sh; 327 }; 328 - } ../hooks/qmake-hook.sh; 329 330 - wrapQtAppsHook = makeSetupHook { 331 name = "wrap-qt5-apps-hook"; 332 - propagatedBuildInputs = [ self.qtbase.dev buildPackages.makeBinaryWrapper ] 333 - ++ lib.optional stdenv.isLinux self.qtwayland.dev; 334 - } ../hooks/wrap-qt-apps-hook.sh; 335 }; 336 337 baseScope = makeScopeWithSplicing' {
··· 12 , bison, cups ? null, harfbuzz, libGL, perl, python3 13 , gstreamer, gst-plugins-base, gtk3, dconf 14 , darwin 15 16 # options 17 , developerBuild ? false ··· 203 204 addPackages = self: with self; 205 let 206 + qtModule = callPackage ../qtModule.nix { 207 + inherit patches; 208 + # Use a variant of mkDerivation that does not include wrapQtApplications 209 + # to avoid cyclic dependencies between Qt modules. 210 + mkDerivation = 211 + (callPackage ../mkDerivation.nix { wrapQtAppsHook = null; }) stdenv.mkDerivation; 212 + }; 213 214 callPackage = self.newScope { inherit qtCompatVersion qtModule srcs stdenv; }; 215 in { 216 217 inherit callPackage qtCompatVersion qtModule srcs; 218 219 + mkDerivationWith = callPackage ../mkDerivation.nix { }; 220 221 mkDerivation = mkDerivationWith stdenv.mkDerivation; 222 ··· 309 ] ++ lib.optional (!stdenv.isDarwin) qtwayland 310 ++ lib.optional (stdenv.isDarwin) qtmacextras); 311 312 + qmake = callPackage ({ qtbase }: makeSetupHook { 313 name = "qmake-hook"; 314 + propagatedBuildInputs = [ qtbase.dev ]; 315 substitutions = { 316 inherit debug; 317 fix_qmake_libtool = ../hooks/fix-qmake-libtool.sh; 318 }; 319 + } ../hooks/qmake-hook.sh) { }; 320 321 + wrapQtAppsHook = callPackage ({ makeBinaryWrapper, qtbase, qtwayland }: makeSetupHook { 322 name = "wrap-qt5-apps-hook"; 323 + propagatedBuildInputs = [ qtbase.dev makeBinaryWrapper ] 324 + ++ lib.optional stdenv.isLinux qtwayland.dev; 325 + } ../hooks/wrap-qt-apps-hook.sh) { }; 326 }; 327 328 baseScope = makeScopeWithSplicing' {
+1 -3
pkgs/development/libraries/qt-5/mkDerivation.nix
··· 1 - { lib, debug, wrapQtAppsHook }: 2 - 3 - let inherit (lib) optional; in 4 5 mkDerivation: 6
··· 1 + { wrapQtAppsHook }: 2 3 mkDerivation: 4
+2 -4
pkgs/development/libraries/qt-5/qtModule.nix
··· 1 - { lib, mkDerivation, perl }: 2 3 let inherit (lib) licenses maintainers platforms; in 4 - 5 - { self, srcs, patches }: 6 7 args: 8 ··· 16 inherit pname version src; 17 patches = (args.patches or []) ++ (patches.${pname} or []); 18 19 - nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ perl self.qmake ]; 20 propagatedBuildInputs = 21 (lib.warnIf (args ? qtInputs) "qt5.qtModule's qtInputs argument is deprecated" args.qtInputs or []) ++ 22 (args.propagatedBuildInputs or []);
··· 1 + { lib, mkDerivation, perl, qmake, patches, srcs }: 2 3 let inherit (lib) licenses maintainers platforms; in 4 5 args: 6 ··· 14 inherit pname version src; 15 patches = (args.patches or []) ++ (patches.${pname} or []); 16 17 + nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ perl qmake ]; 18 propagatedBuildInputs = 19 (lib.warnIf (args ? qtInputs) "qt5.qtModule's qtInputs argument is deprecated" args.qtInputs or []) ++ 20 (args.propagatedBuildInputs or []);
+1 -1
pkgs/top-level/all-packages.nix
··· 24656 inherit (__splicedPackages) 24657 makeScopeWithSplicing' generateSplicesForMkScope lib fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper 24658 bison cups dconf harfbuzz libGL perl gtk3 python3 24659 - darwin buildPackages; 24660 inherit (__splicedPackages.gst_all_1) gstreamer gst-plugins-base; 24661 inherit config; 24662 stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
··· 24656 inherit (__splicedPackages) 24657 makeScopeWithSplicing' generateSplicesForMkScope lib fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper 24658 bison cups dconf harfbuzz libGL perl gtk3 python3 24659 + darwin; 24660 inherit (__splicedPackages.gst_all_1) gstreamer gst-plugins-base; 24661 inherit config; 24662 stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;