diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-12-05 13:22:20 +0100 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-12-05 13:22:20 +0100 |
| commit | f32cee9f3c40302ff7b14d09448db0901aaa23c1 (patch) | |
| tree | 7bce4f2a0fdd9a49d9be0cb6f50a28cbccc2b525 /pkgs/top-level | |
| parent | d267d265780f1a013585553238970b9483dcbb50 (diff) | |
| parent | 6e51c97f1c849efdfd4f3b78a4870e6aa2da4198 (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6637b49e65e38..eb8d4c24d5b01 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15074,6 +15074,8 @@ with pkgs; rgbds = callPackage ../development/compilers/rgbds { }; + rml = callPackage ../development/compilers/rml { }; + composable_kernel = callPackage ../development/libraries/composable_kernel { inherit (llvmPackages) openmp; }; @@ -22204,11 +22206,11 @@ with pkgs; qt6 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-6) { inherit newScope; - inherit lib stdenv fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper writeText; + inherit lib fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper writeText; inherit bison cups dconf harfbuzz libGL perl gtk3 ninja; inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi; - inherit buildPackages; - inherit libglvnd; + inherit darwin buildPackages libglvnd; + 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 |