public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qt5: make package sets overridable

Browse Source
This commit is contained in:
Thomas Tuegel 2017-04-25 07:32:51 -05:00
parent 901a778c77
commit 6fa2979ebc
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
1 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
pkgs/top-level/all-packages.nix
View File

@ -9526,30 +9526,32 @@ with pkgs;
developerBuild = true; developerBuild = true;
}); });
qt56 = recurseIntoAttrs (import ../development/libraries/qt-5/5.6 { qt56 = recurseIntoAttrs (makeOverridable
inherit newScope; (import ../development/libraries/qt-5/5.6) {
inherit stdenv fetchurl makeSetupHook makeWrapper; inherit newScope;
bison = bison2; # error: too few arguments to function 'int yylex(... inherit stdenv fetchurl makeSetupHook makeWrapper;
inherit cups; bison = bison2; # error: too few arguments to function 'int yylex(...
harfbuzz = harfbuzz-icu; inherit cups;
mesa = mesa_noglu; harfbuzz = harfbuzz-icu;
inherit perl; mesa = mesa_noglu;
inherit (gst_all_1) gstreamer gst-plugins-base; inherit perl;
}); inherit (gst_all_1) gstreamer gst-plugins-base;
});
libsForQt56 = recurseIntoAttrs (lib.makeScope qt56.newScope mkLibsForQt5); libsForQt56 = recurseIntoAttrs (lib.makeScope qt56.newScope mkLibsForQt5);
qt58 = recurseIntoAttrs (import ../development/libraries/qt-5/5.8 { qt58 = recurseIntoAttrs (makeOverridable
inherit newScope; (import ../development/libraries/qt-5/5.8) {
inherit stdenv fetchurl makeSetupHook makeWrapper; inherit newScope;
bison = bison2; # error: too few arguments to function 'int yylex(... inherit stdenv fetchurl makeSetupHook makeWrapper;
inherit cups; bison = bison2; # error: too few arguments to function 'int yylex(...
harfbuzz = harfbuzz-icu; inherit cups;
mesa = mesa_noglu; harfbuzz = harfbuzz-icu;
inherit perl; mesa = mesa_noglu;
inherit (gst_all_1) gstreamer gst-plugins-base; inherit perl;
inherit (gnome3) gtk3 dconf; inherit (gst_all_1) gstreamer gst-plugins-base;
}); inherit (gnome3) gtk3 dconf;
});
libsForQt58 = recurseIntoAttrs (lib.makeScope qt58.newScope mkLibsForQt5); libsForQt58 = recurseIntoAttrs (lib.makeScope qt58.newScope mkLibsForQt5);