cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #136232 from tweag/qt5-out-of-tree-modules

Browse source 
qt5: Expose internal variables to facilitate out-of-tree building of modules
This commit is contained in:
adisbladis 2021-08-31 14:16:32 -05:00 committed by GitHub
commit bcddcb26be
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/libraries/qt-5/5.12/default.nix
View file

@ -127,6 +127,8 @@ let
callPackage = self.newScope { inherit qtCompatVersion qtModule srcs; }; callPackage = self.newScope { inherit qtCompatVersion qtModule srcs; };
in { in {
inherit callPackage qtCompatVersion qtModule srcs;
mkDerivationWith = mkDerivationWith =
import ../mkDerivation.nix import ../mkDerivation.nix
{ inherit lib; inherit debug; inherit (self) wrapQtAppsHook; }; { inherit lib; inherit debug; inherit (self) wrapQtAppsHook; };

2
pkgs/development/libraries/qt-5/5.14/default.nix
View file

@ -139,6 +139,8 @@ let
callPackage = self.newScope { inherit qtCompatVersion qtModule srcs; }; callPackage = self.newScope { inherit qtCompatVersion qtModule srcs; };
in { in {
inherit callPackage qtCompatVersion qtModule srcs;
mkDerivationWith = mkDerivationWith =
import ../mkDerivation.nix import ../mkDerivation.nix
{ inherit lib; inherit debug; inherit (self) wrapQtAppsHook; }; { inherit lib; inherit debug; inherit (self) wrapQtAppsHook; };

2
pkgs/development/libraries/qt-5/5.15/default.nix
View file

@ -165,6 +165,8 @@ let
callPackage = self.newScope { inherit qtCompatVersion qtModule srcs; }; callPackage = self.newScope { inherit qtCompatVersion qtModule srcs; };
in { in {
inherit callPackage qtCompatVersion qtModule srcs;
mkDerivationWith = mkDerivationWith =
import ../mkDerivation.nix import ../mkDerivation.nix
{ inherit lib; inherit debug; inherit (self) wrapQtAppsHook; }; { inherit lib; inherit debug; inherit (self) wrapQtAppsHook; };