nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-07 04:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nick Cao 2023-04-10 17:53:27 +08:00
parent 845e491205
commit 12cfa69c8e
No known key found for this signature in database
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/qt-6/default.nix
View File

@ -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

10
pkgs/top-level/all-packages.nix
View File

@ -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;