diff options
author | Artturin <Artturin@artturin.com> | 2023-11-09 23:35:26 +0200 |
---|---|---|
committer | Adam Joseph <54836058+amjoseph-nixpkgs@users.noreply.github.com> | 2023-11-11 08:56:38 +0000 |
commit | 99c891175d45b53c1be4d0703f7b9609ea61d8f8 (patch) | |
tree | 5b7ce8478c5b2055e7bab5577acf17c62817ab99 /pkgs/top-level/qt5-packages.nix | |
parent | d40361134a407a930e383d7474aca84351b30703 (diff) | |
download | nixlib-99c891175d45b53c1be4d0703f7b9609ea61d8f8.tar nixlib-99c891175d45b53c1be4d0703f7b9609ea61d8f8.tar.gz nixlib-99c891175d45b53c1be4d0703f7b9609ea61d8f8.tar.bz2 nixlib-99c891175d45b53c1be4d0703f7b9609ea61d8f8.tar.lz nixlib-99c891175d45b53c1be4d0703f7b9609ea61d8f8.tar.xz nixlib-99c891175d45b53c1be4d0703f7b9609ea61d8f8.tar.zst nixlib-99c891175d45b53c1be4d0703f7b9609ea61d8f8.zip |
libsForQt5: use makeScopeWithSplicing
Fixes getting spliced packages with `libsForQt5.callPackage`
Diffstat (limited to 'pkgs/top-level/qt5-packages.nix')
-rw-r--r-- | pkgs/top-level/qt5-packages.nix | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index ec2a1b1f7194..7717adb9a373 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -7,13 +7,19 @@ { lib -, pkgs -, qt5 +, __splicedPackages +, makeScopeWithSplicing' +, generateSplicesForMkScope }: -(lib.makeScope pkgs.newScope ( self: - let + pkgs = __splicedPackages; + qt5 = __splicedPackages.qt5; +in + +makeScopeWithSplicing' { + otherSplices = generateSplicesForMkScope "libsForQt5"; + f = (self: let libsForQt5 = self; callPackage = self.callPackage; @@ -59,7 +65,7 @@ let }; in (lib.makeOverridable mkMaui attrs); -in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGear // mauiPackages // qt5 // { +in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGear // mauiPackages // qt5 // ({ inherit kdeFrameworks plasmaMobileGear plasma5 kdeGear mauiPackages qt5; @@ -250,4 +256,9 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea xp-pen-g430-driver = callPackage ../os-specific/linux/xp-pen-drivers/g430 { }; yuview = callPackage ../applications/video/yuview { }; -}))) +} // lib.optionalAttrs pkgs.config.allowAliases { + # remove after 23.11 branch-off and backport removal to 23.11 + # 23.11 will have a warning for this in `makeScope` itself + overrideScope' = lib.warn "libsForQt5 now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\"." self.overrideScope; +}))); +} |