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-6/default.nix | |
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-6/default.nix')
-rw-r--r-- | pkgs/development/libraries/qt-6/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 74ac03bbeb6da..d90834e0b3e2d 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -169,7 +169,7 @@ let } ./hooks/qmake-hook.sh; }; - # TODO(@Artturin): convert to makeScopeWithSplicing + # TODO(@Artturin): convert to makeScopeWithSplicing' # simple example of how to do that in 5568a4d25ca406809530420996d57e0876ca1a01 self = lib.makeScope newScope addPackages; in |