diff options
| author | Theodore Ni <3806110+tjni@users.noreply.github.com> | 2023-08-20 12:01:10 -0700 |
|---|---|---|
| committer | Theodore Ni <3806110+tjni@users.noreply.github.com> | 2023-08-20 12:01:22 -0700 |
| commit | dab839357e9e914993a338fd1c8003a6047a8aaf (patch) | |
| tree | 99039605e23e9972492069a2e0deeeb18849fc51 /pkgs/development/libraries/qt-5/5.15 | |
| parent | 57d8f92a860e4e531419cf2493c08ce194588c10 (diff) | |
| parent | 0b07d4957ee1bd7fd3bdfd12db5f361bd70175a6 (diff) | |
Merge branch 'master' into staging-next
Had to merge https://github.com/NixOS/nixpkgs/pull/245957 and https://github.com/NixOS/nixpkgs/pull/247245.
Diffstat (limited to 'pkgs/development/libraries/qt-5/5.15')
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.15/default.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 16be29ad529e8..04fdf52982573 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -7,7 +7,7 @@ Check for any minor version changes. */ -{ makeScopeWithSplicing, generateSplicesForMkScope +{ makeScopeWithSplicing', generateSplicesForMkScope , lib, stdenv, fetchurl, fetchgit, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper , bison, cups ? null, harfbuzz, libGL, perl, python3 , gstreamer, gst-plugins-base, gtk3, dconf @@ -265,6 +265,7 @@ let qtquick1 = null; qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {}; qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {}; + qtremoteobjects = callPackage ../modules/qtremoteobjects.nix {}; qtscript = callPackage ../modules/qtscript.nix {}; qtsensors = callPackage ../modules/qtsensors.nix {}; qtserialbus = callPackage ../modules/qtserialbus.nix {}; @@ -332,4 +333,7 @@ let } ../hooks/wrap-qt-apps-hook.sh; }; -in makeScopeWithSplicing (generateSplicesForMkScope "qt5") (_: {}) (_: {}) addPackages +in makeScopeWithSplicing' { + otherSplices = generateSplicesForMkScope "qt5"; + f = addPackages; +} |