dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

qt5: remove with self;

Browse Source 
The `self` does not contain spliced packages, callPackage works
properly.
This commit is contained in:
Artturin 2023-10-25 03:15:00 +03:00
parent 19e047434c
commit bd02bf1ea3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/qt-5/5.15/default.nix
View File

@ -201,7 +201,7 @@ let
qttools = [ ./qttools.patch ];
};
addPackages = self: with self;
addPackages = self:
let
qtModule = callPackage ../qtModule.nix {
inherit patches;
@ -218,7 +218,7 @@ let
mkDerivationWith = callPackage ../mkDerivation.nix { };
mkDerivation = mkDerivationWith stdenv.mkDerivation;
mkDerivation = callPackage ({ mkDerivationWith }: mkDerivationWith stdenv.mkDerivation) { };
qtbase = callPackage ../modules/qtbase.nix {
inherit (srcs.qtbase) src version;
@ -300,7 +300,9 @@ let
qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix {};
env = callPackage ../qt-env.nix {};
full = env "qt-full-${qtbase.version}" ([
full = callPackage ({ env, qtbase }: env "qt-full-${qtbase.version}") { }
# `with self` is ok to use here because having these spliced is unnecessary
(with self; [
qt3d qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects
qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2
qtscript qtsensors qtserialport qtsvg qttools qttranslations