diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-25 22:16:31 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-26 21:55:12 -0400 |
| commit | c1f1a0ea159a4513be524fa775ad708debd19aa1 (patch) | |
| tree | e87961bd0806a44d201c5bd8420d2ac501c097a8 | |
| parent | 29cdd08e8e7643002ab84c3a10f9b13a2de211f5 (diff) | |
| download | nixpkgs-c1f1a0ea159a4513be524fa775ad708debd19aa1.tar nixpkgs-c1f1a0ea159a4513be524fa775ad708debd19aa1.tar.gz nixpkgs-c1f1a0ea159a4513be524fa775ad708debd19aa1.tar.bz2 nixpkgs-c1f1a0ea159a4513be524fa775ad708debd19aa1.tar.lz nixpkgs-c1f1a0ea159a4513be524fa775ad708debd19aa1.tar.xz nixpkgs-c1f1a0ea159a4513be524fa775ad708debd19aa1.tar.zst nixpkgs-c1f1a0ea159a4513be524fa775ad708debd19aa1.zip | |
qt5: use llvm5 for all modules
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.
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.11/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.12/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 13 insertions, 7 deletions
diff --git a/pkgs/development/libraries/qt-5/5.11/default.nix b/pkgs/development/libraries/qt-5/5.11/default.nix index 0b6ba8c8746..0014a1452aa 100644 --- a/pkgs/development/libraries/qt-5/5.11/default.nix +++ b/pkgs/development/libraries/qt-5/5.11/default.nix @@ -20,7 +20,7 @@ top-level attribute to `top-level/all-packages.nix`. stdenv, fetchurl, fetchFromGitHub, makeSetupHook, bison, cups ? null, harfbuzz, libGL, perl, gstreamer, gst-plugins-base, gtk3, dconf, - cf-private, + cf-private, llvmPackages_5, # options developerBuild ? false, @@ -65,8 +65,10 @@ let }; mkDerivation = - import ../mkDerivation.nix - { inherit stdenv; inherit (stdenv) lib; } + import ../mkDerivation.nix { + inherit (stdenv) lib; + stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv; + } { inherit debug; }; qtModule = @@ -97,7 +99,7 @@ let qtdoc = callPackage ../modules/qtdoc.nix {}; qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {}; qtimageformats = callPackage ../modules/qtimageformats.nix {}; - qtlocation = callPackage ../modules/qtlocation.nix {}; + qtlocation = callPackage ../modules/qtlocation.nix { }; qtmacextras = callPackage ../modules/qtmacextras.nix { inherit cf-private; }; diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index b3095dd9a7e..d84596bd054 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -20,7 +20,7 @@ top-level attribute to `top-level/all-packages.nix`. stdenv, fetchurl, fetchFromGitHub, makeSetupHook, bison, cups ? null, harfbuzz, libGL, perl, gstreamer, gst-plugins-base, gtk3, dconf, - cf-private, + cf-private, llvmPackages_5, # options developerBuild ? false, @@ -69,8 +69,10 @@ let }; mkDerivation = - import ../mkDerivation.nix - { inherit stdenv; inherit (stdenv) lib; } + import ../mkDerivation.nix { + inherit (stdenv) lib; + stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv; + } { inherit debug; }; qtModule = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 00cdeeeb297..1cde1ad0beb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12500,6 +12500,7 @@ in inherit gtk3; inherit (gnome3) dconf; inherit (gst_all_1) gstreamer gst-plugins-base; + inherit llvmPackages_5; }); libsForQt511 = recurseIntoAttrs (lib.makeScope qt511.newScope mkLibsForQt5); @@ -12517,6 +12518,7 @@ in inherit gtk3; inherit (gnome3) dconf; inherit (gst_all_1) gstreamer gst-plugins-base; + inherit llvmPackages_5; }); libsForQt512 = recurseIntoAttrs (lib.makeScope qt512.newScope mkLibsForQt5); |