Unverified Commit 12cfa69c authored by Nick Cao's avatar Nick Cao
Browse files

qt6: move stdenv and cmake override to within pkgs/development/libraries/qt-6

parent 845e4912

pkgs/development/libraries/qt-6/default.nix

+10 −2
Original line number Diff line number Diff line
@@ -35,7 +35,15 @@ let 


  addPackages = self: with self;

    let

      callPackage = self.newScope ({ inherit qtModule stdenv srcs cmake; });

      callPackage = self.newScope ({

        inherit qtModule srcs;

        stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;

        cmake = cmake.overrideAttrs (attrs: {

          patches = attrs.patches ++ [

            ./patches/cmake.patch

          ];

        });

      });

    in

    {
@@ -46,7 +54,7 @@ let 
      qtbase = callPackage ./modules/qtbase.nix {

        withGtk3 = true;

        inherit (srcs.qtbase) src version;

        inherit bison cups harfbuzz libGL dconf gtk3 developerBuild cmake;

        inherit bison cups harfbuzz libGL dconf gtk3 developerBuild;

        inherit (darwin.apple_sdk_11_0.frameworks) AGL AVFoundation AppKit GSS MetalKit;

        patches = [

          ./patches/qtbase-qmake-mkspecs-mac.patch

pkgs/top-level/all-packages.nix

+1 −9
Original line number Diff line number Diff line
@@ -23216,15 +23216,7 @@ with pkgs; 
  qtEnv = qt5.env;

  qt5Full = qt5.full;













  qt6 = recurseIntoAttrs













    (callPackage ../development/libraries/qt-6 {













      stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;













      cmake = cmake.overrideAttrs (attrs: {













        patches = attrs.patches ++ [













          ../development/libraries/qt-6/patches/cmake.patch













        ];













      });













    });













  qt6 = recurseIntoAttrs (callPackage ../development/libraries/qt-6 { });





























  qt6Packages = recurseIntoAttrs (import ./qt6-packages.nix {















    inherit lib pkgs qt6;