ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-21 20:49:52 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #151903 from prusnak/qt5-darwin-stdenv

Browse Source 
qt5{12,14,15}: use default stdenv on darwin
This commit is contained in:
Dmitry Kalinkin 2021-12-26 00:17:44 -05:00 committed by GitHub
commit cedc24590b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 {

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

@ -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;

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

@ -11,7 +11,7 @@ Check for any minor version changes.
, lib, stdenv, fetchurl, fetchgit, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper
, bison, cups ? null, harfbuzz, libGL, perl
, gstreamer, gst-plugins-base, gtk3, dconf
, llvmPackages_5, darwin
, darwin
# options
, developerBuild ? false
@ -25,8 +25,6 @@ let
qtCompatVersion = srcs.qtbase.version;
stdenvActual = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv;
patches = {
qtbase = lib.optionals stdenv.isDarwin [
./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
@ -92,7 +90,7 @@ let
mkDerivation =
import ../mkDerivation.nix
{ inherit lib; inherit debug; wrapQtAppsHook = null; }
stdenvActual.mkDerivation;
stdenv.mkDerivation;
}
{ inherit self srcs patches; };
@ -107,7 +105,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;

7
pkgs/development/libraries/qt-5/modules/qtbase.nix
View File

@ -362,7 +362,12 @@ stdenv.mkDerivation {
license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];
maintainers = with maintainers; [ qknight ttuegel periklis bkchr ];
platforms = platforms.unix;
broken = stdenv.isDarwin && (compareVersion "5.9.0" < 0);
# Qt5 is broken on aarch64-darwin
# the build ends up with the following error:
# error: unknown target CPU 'armv8.3-a+crypto+sha2+aes+crc+fp16+lse+simd+ras+rdm+rcpc'
# note: valid target CPU values are: nocona, core2, penryn, ..., znver1, znver2, x86-64
# it seems the qmake/cmake passes x86_64 as preferred architecture somewhere
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

6
pkgs/development/libraries/qt-5/modules/qtwebengine.nix
View File

@ -241,6 +241,10 @@ qtModule {
platforms = platforms.unix;
# This build takes a long time; particularly on slow architectures
timeout = 24 * 3600;
broken = stdenv.isDarwin && (lib.versionAtLeast qtCompatVersion "5.14"); # requires a newer SDK
# we are still stuck with MacOS SDK 10.12 on x86_64-darwin
# and qtwebengine 5.14+ requires at least SDK 10.14
# (qtwebengine 5.12 is fine with SDK 10.12)
# on aarch64-darwin we are already at MacOS SDK 11.0
broken = stdenv.isDarwin && stdenv.isx86_64 && (lib.versionAtLeast qtCompatVersion "5.14");
};
}

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

@ -19436,7 +19436,7 @@ with pkgs;
inherit lib stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper;
inherit bison cups dconf harfbuzz libGL perl gtk3;
inherit (gst_all_1) gstreamer gst-plugins-base;
inherit llvmPackages_5 darwin;
inherit darwin;
});
qt514 = recurseIntoAttrs (makeOverridable
@ -19445,7 +19445,7 @@ with pkgs;
inherit lib stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper;
inherit bison cups dconf harfbuzz libGL perl gtk3;
inherit (gst_all_1) gstreamer gst-plugins-base;
inherit llvmPackages_5 darwin;
inherit darwin;
});
qt515 = recurseIntoAttrs (makeOverridable
@ -19454,7 +19454,7 @@ with pkgs;
inherit lib stdenv fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper;
inherit bison cups dconf harfbuzz libGL perl gtk3;
inherit (gst_all_1) gstreamer gst-plugins-base;
inherit llvmPackages_5 darwin;
inherit darwin;
});
libsForQt512 = recurseIntoAttrs (import ./qt5-packages.nix {