diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix b/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix index c12a20dd4daf..ddd9d76df4ea 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix @@ -18,7 +18,7 @@ top-level attribute to `top-level/all-packages.nix`. , lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper , bison, cups ? null, harfbuzz, libGL, perl , gstreamer, gst-plugins-base, gtk3, dconf -, llvmPackages_5, darwin +, darwin # options , developerBuild ? false @@ -30,8 +30,6 @@ let qtCompatVersion = srcs.qtbase.version; - stdenvActual = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv; - mirror = "https://download.qt.io"; srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; } // { # qtwebkit does not have an official release tarball on the qt mirror and is @@ -130,7 +128,7 @@ let mkDerivation = import ../mkDerivation.nix { inherit lib; inherit debug; wrapQtAppsHook = null; } - stdenvActual.mkDerivation; + stdenv.mkDerivation; } { inherit self srcs patches; }; @@ -145,7 +143,7 @@ let import ../mkDerivation.nix { inherit lib; inherit debug; inherit (self) wrapQtAppsHook; }; - mkDerivation = mkDerivationWith stdenvActual.mkDerivation; + mkDerivation = mkDerivationWith stdenv.mkDerivation; qtbase = callPackage ../modules/qtbase.nix { inherit (srcs.qtbase) src version; @@ -163,6 +161,9 @@ let qtconnectivity = callPackage ../modules/qtconnectivity.nix {}; qtdeclarative = callPackage ../modules/qtdeclarative.nix {}; qtdoc = callPackage ../modules/qtdoc.nix {}; + qtgamepad = callPackage ../modules/qtgamepad.nix { + inherit (darwin.apple_sdk.frameworks) GameController; + }; qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {}; qtimageformats = callPackage ../modules/qtimageformats.nix {}; qtlocation = callPackage ../modules/qtlocation.nix {}; |