diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2018-01-15 18:49:13 -0600 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@mailbox.org> | 2018-01-15 18:49:13 -0600 |
| commit | 617c4f4220b6266e5b21341c8cef83431a217d4f (patch) | |
| tree | 75012c9aa50aecf2e94b92fb0343dd1a522a9cf9 /pkgs/top-level | |
| parent | fb069b77ee742140b1607ebe6e9fa8cafd20e224 (diff) | |
| parent | 37933209588792db24104dbfaef0106c3bef870d (diff) | |
Merge branch 'feature/qt-5/5.10.0' into merge/qt-5.10.0
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 910afc8ac6922..5435f51a618cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10604,8 +10604,23 @@ with pkgs; libsForQt59 = recurseIntoAttrs (lib.makeScope qt59.newScope mkLibsForQt5); - qt5 = qt59; - libsForQt5 = libsForQt59; + qt510 = recurseIntoAttrs (makeOverridable + (import ../development/libraries/qt-5/5.10) { + inherit newScope; + inherit stdenv fetchurl makeSetupHook makeWrapper; + bison = bison2; # error: too few arguments to function 'int yylex(... + inherit cups; + harfbuzz = harfbuzz-icu; + mesa = mesa_noglu; + inherit perl; + inherit (gst_all_1) gstreamer gst-plugins-base; + inherit (gnome3) gtk3 dconf; + }); + + libsForQt510 = recurseIntoAttrs (lib.makeScope qt510.newScope mkLibsForQt5); + + qt5 = qt510; + libsForQt5 = libsForQt510; qt5ct = libsForQt5.callPackage ../tools/misc/qt5ct { }; |