|
|
|
@ -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; } // { |
|
|
|
|
# Community port of the now unmaintained upstream qtwebkit. |
|
|
|
@ -129,7 +127,7 @@ let |
|
|
|
|
mkDerivation = |
|
|
|
|
import ../mkDerivation.nix |
|
|
|
|
{ inherit lib; inherit debug; wrapQtAppsHook = null; } |
|
|
|
|
stdenvActual.mkDerivation; |
|
|
|
|
stdenv.mkDerivation; |
|
|
|
|
} |
|
|
|
|
{ inherit self srcs patches; }; |
|
|
|
|
|
|
|
|
@ -144,7 +142,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; |
|
|
|
@ -193,7 +191,6 @@ let |
|
|
|
|
inherit (darwin.apple_sdk.libs) sandbox; |
|
|
|
|
inherit (darwin.apple_sdk.frameworks) ApplicationServices AVFoundation Foundation ForceFeedback GameController AppKit |
|
|
|
|
ImageCaptureCore CoreBluetooth IOBluetooth CoreWLAN Quartz Cocoa LocalAuthentication; |
|
|
|
|
stdenv = stdenvActual; |
|
|
|
|
}; |
|
|
|
|
qtwebglplugin = callPackage ../modules/qtwebglplugin.nix {}; |
|
|
|
|
qtwebkit = callPackage ../modules/qtwebkit.nix { |
|
|
|
|