MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

qt5: Expose internal variables to facilitate out-of-tree building of modules

Browse source 
As it is currently it's almost impossible to accomplish something like:
```nix
...

(qt5.callPackage (
  { qtModule, qtbase, qtdeclarative }:
  qtModule {
    pname = "qt3d";
    qtInputs = [ qtbase qtdeclarative ];
    outputs = [ "out" "dev" "bin" ];
  }
) { })

...
```
because all the required variables such as qtModule are internal-only.

By exposing these it's easier for external projects not to be bound
exactly by the module definitions explicitly listed in nixpkgs.
This commit is contained in:
adisbladis 2021-08-30 15:15:44 -05:00
parent 7032ab6d61
commit 20ce363de4
No known key found for this signature in database
GPG key ID: 110BFAD44C6249B7
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; };
in {
inherit callPackage qtCompatVersion qtModule srcs;
mkDerivationWith =
import ../mkDerivation.nix
{ 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; };
in {
inherit callPackage qtCompatVersion qtModule srcs;
mkDerivationWith =
import ../mkDerivation.nix
{ 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; };
in {
inherit callPackage qtCompatVersion qtModule srcs;
mkDerivationWith =
import ../mkDerivation.nix
{ inherit lib; inherit debug; inherit (self) wrapQtAppsHook; };