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

qt5: use llvm5 for all modules

Browse Source 
This avoids some issues encountered with qt5 not working libcxx 7. We
can remove this at some point when qt5 has addressed all of their issues.
This commit is contained in:
Matthew Bauer 2019-04-25 22:16:31 -04:00
parent 29cdd08e8e
commit c1f1a0ea15
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,7 @@ top-level attribute to `top-level/all-packages.nix`.
stdenv, fetchurl, fetchFromGitHub, makeSetupHook, stdenv, fetchurl, fetchFromGitHub, makeSetupHook,
bison, cups ? null, harfbuzz, libGL, perl, bison, cups ? null, harfbuzz, libGL, perl,
gstreamer, gst-plugins-base, gtk3, dconf, gstreamer, gst-plugins-base, gtk3, dconf,
cf-private, cf-private, llvmPackages_5,
# options # options
developerBuild ? false, developerBuild ? false,
@ -65,8 +65,10 @@ let
}; };
mkDerivation = mkDerivation =
import ../mkDerivation.nix import ../mkDerivation.nix {
{ inherit stdenv; inherit (stdenv) lib; } inherit (stdenv) lib;
stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv;
}
{ inherit debug; }; { inherit debug; };
qtModule = qtModule =

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

@ -20,7 +20,7 @@ top-level attribute to `top-level/all-packages.nix`.
stdenv, fetchurl, fetchFromGitHub, makeSetupHook, stdenv, fetchurl, fetchFromGitHub, makeSetupHook,
bison, cups ? null, harfbuzz, libGL, perl, bison, cups ? null, harfbuzz, libGL, perl,
gstreamer, gst-plugins-base, gtk3, dconf, gstreamer, gst-plugins-base, gtk3, dconf,
cf-private, cf-private, llvmPackages_5,
# options # options
developerBuild ? false, developerBuild ? false,
@ -69,8 +69,10 @@ let
}; };
mkDerivation = mkDerivation =
import ../mkDerivation.nix import ../mkDerivation.nix {
{ inherit stdenv; inherit (stdenv) lib; } inherit (stdenv) lib;
stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv;
}
{ inherit debug; }; { inherit debug; };
qtModule = qtModule =

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

@ -12500,6 +12500,7 @@ in
inherit gtk3; inherit gtk3;
inherit (gnome3) dconf; inherit (gnome3) dconf;
inherit (gst_all_1) gstreamer gst-plugins-base; inherit (gst_all_1) gstreamer gst-plugins-base;
inherit llvmPackages_5;
}); });
libsForQt511 = recurseIntoAttrs (lib.makeScope qt511.newScope mkLibsForQt5); libsForQt511 = recurseIntoAttrs (lib.makeScope qt511.newScope mkLibsForQt5);
@ -12517,6 +12518,7 @@ in
inherit gtk3; inherit gtk3;
inherit (gnome3) dconf; inherit (gnome3) dconf;
inherit (gst_all_1) gstreamer gst-plugins-base; inherit (gst_all_1) gstreamer gst-plugins-base;
inherit llvmPackages_5;
}); });
libsForQt512 = recurseIntoAttrs (lib.makeScope qt512.newScope mkLibsForQt5); libsForQt512 = recurseIntoAttrs (lib.makeScope qt512.newScope mkLibsForQt5);