diff options
| author | Theodore Ni <3806110+tjni@users.noreply.github.com> | 2023-08-20 20:09:45 -0700 |
|---|---|---|
| committer | Theodore Ni <3806110+tjni@users.noreply.github.com> | 2023-08-20 20:09:45 -0700 |
| commit | d49408401798a6736825c4ac6a9bc0c94c0f335b (patch) | |
| tree | eb0f9bcf9cedafbf1edeaa401cd3774789a52c27 /pkgs/development/libraries/qt-5 | |
| parent | ef4e037e2b3029c6e70433c872c167ef6b78e621 (diff) | |
| parent | 5883668123e7b1563f68daea20761ad34b38c42c (diff) | |
Merge branch 'staging-next' into staging
Merging https://github.com/NixOS/nixpkgs/pull/245957 with https://github.com/NixOS/nixpkgs/pull/246022.
Diffstat (limited to 'pkgs/development/libraries/qt-5')
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.15/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-5/modules/qtremoteobjects.nix | 8 |
2 files changed, 14 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 646c0ca87c260..e6e6b24360a42 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 @@ -266,6 +266,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 {}; @@ -333,7 +334,10 @@ let } ../hooks/wrap-qt-apps-hook.sh; }; - baseScope = makeScopeWithSplicing (generateSplicesForMkScope "qt5") (_: {}) (_: {}) addPackages; + baseScope = makeScopeWithSplicing' { + otherSplices = generateSplicesForMkScope "qt5"; + f = addPackages; + }; bootstrapScope = baseScope.overrideScope(final: prev: { qtbase = prev.qtbase.override { qttranslations = null; }; diff --git a/pkgs/development/libraries/qt-5/modules/qtremoteobjects.nix b/pkgs/development/libraries/qt-5/modules/qtremoteobjects.nix new file mode 100644 index 0000000000000..a71f9e8e352d6 --- /dev/null +++ b/pkgs/development/libraries/qt-5/modules/qtremoteobjects.nix @@ -0,0 +1,8 @@ +{ qtModule, qtbase, qtdeclarative }: + +qtModule { + pname = "qtremoteobjects"; + qtInputs = [ qtbase qtdeclarative ]; + # cycle is detected in build when adding "dev" "bin" too + outputs = [ "out" ]; +} |