Skip to content
Permalink
Browse files

treewide: remove old patches for macOS

These shouldn’t be needed now that we are on macOS 10.12.
  • Loading branch information...
matthewbauer committed Feb 9, 2019
1 parent 5fad67d commit 0fe315c9b6080cd75f92fea1f97714b04abb4315
Showing with 22 additions and 1,198 deletions.
  1. +1 −7 pkgs/applications/networking/browsers/firefox/common.nix
  2. +0 −74 pkgs/development/compilers/llvm/7/compiler-rt-clock_gettime.patch
  3. +2 −3 pkgs/development/compilers/llvm/7/compiler-rt.nix
  4. +0 −5 pkgs/development/libraries/libdrm/default.nix
  5. +0 −88 pkgs/development/libraries/libdrm/libdrm-apple.patch
  6. +0 −41 pkgs/development/libraries/libsnark/darwin-fix-clock-gettime.patch
  7. +0 −2 pkgs/development/libraries/libsnark/default.nix
  8. +0 −76 pkgs/development/libraries/mesa/darwin-clock-gettime.patch
  9. +1 −1 pkgs/development/libraries/mesa/default.nix
  10. +5 −17 pkgs/development/libraries/qt-5/5.11/default.nix
  11. +0 −13 pkgs/development/libraries/qt-5/5.11/qtbase-darwin-nseventtype.patch
  12. +0 −73 pkgs/development/libraries/qt-5/5.11/qtbase-darwin-revert-69221.patch
  13. +0 −70 pkgs/development/libraries/qt-5/5.11/qtbase-darwin.patch
  14. +0 −102 pkgs/development/libraries/qt-5/5.11/qtbase-revert-no-macos10.10.patch
  15. +0 −30 pkgs/development/libraries/qt-5/5.11/qtwebengine-clang-fix.patch
  16. +0 −21 pkgs/development/libraries/qt-5/5.11/qtwebengine-darwin-old-sdk.patch
  17. +0 −160 pkgs/development/libraries/qt-5/5.11/qtwebengine-darwin-sdk-10.10.patch
  18. +0 −11 pkgs/development/libraries/qt-5/5.11/qtwebkit-darwin-no-qos-classes.patch
  19. +0 −45 pkgs/development/libraries/qt-5/5.11/qtwebkit-darwin-no-readline.patch
  20. +0 −4 pkgs/development/libraries/qt-5/5.12/default.nix
  21. +0 −13 pkgs/development/libraries/qt-5/5.12/qtbase-darwin-nseventtype.patch
  22. +0 −70 pkgs/development/libraries/qt-5/5.12/qtbase-darwin.patch
  23. +0 −102 pkgs/development/libraries/qt-5/5.12/qtbase-revert-no-macos10.10.patch
  24. +1 −1 pkgs/development/libraries/qt-5/5.9/default.nix
  25. +0 −35 pkgs/development/libraries/qt-5/5.9/qtbase-darwin.patch
  26. +9 −26 pkgs/development/libraries/qt-5/modules/qtbase.nix
  27. +1 −17 pkgs/development/libraries/qt-5/modules/qtwebengine.nix
  28. +1 −1 pkgs/development/python-modules/matplotlib/2.nix
  29. +0 −10 pkgs/development/python-modules/matplotlib/darwin-stdenv-2.2.3.patch
  30. +0 −12 pkgs/development/python-modules/matplotlib/darwin-stdenv.patch
  31. +1 −2 pkgs/development/python-modules/matplotlib/default.nix
  32. +0 −64 pkgs/games/gargoyle/darwin.patch
  33. +0 −2 pkgs/games/gargoyle/default.nix
@@ -153,15 +153,9 @@ stdenv.mkDerivation rec {
]
++ lib.optionals (!isTorBrowserLike) [
"-I${nss.dev}/include/nss"
]
++ lib.optional stdenv.isDarwin [
"-isystem ${llvmPackages.libcxx}/include/c++/v1"
"-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10"
];

postPatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace js/src/jsmath.cpp --replace 'defined(HAVE___SINCOS)' 0
'' + lib.optionalString (lib.versionAtLeast ffversion "63.0" && !isTorBrowserLike) ''
postPatch = lib.optionalString (lib.versionAtLeast ffversion "63.0" && !isTorBrowserLike) ''
substituteInPlace third_party/prio/prio/rand.c --replace 'nspr/prinit.h' 'prinit.h'
'';

This file was deleted.

@@ -26,9 +26,8 @@ stdenv.mkDerivation rec {

patches = [
./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory
] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./crtbegin-and-end.patch
++ stdenv.lib.optional stdenv.hostPlatform.isDarwin ./compiler-rt-clock_gettime.patch;
] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./crtbegin-and-end.patch
++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch;

# TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
# to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra
@@ -14,17 +14,12 @@ stdenv.mkDerivation rec {
buildInputs = [ libpthreadstubs libpciaccess valgrind-light ];
# libdrm as of 2.4.70 does not actually do anything with udev.

patches = stdenv.lib.optional stdenv.isDarwin ./libdrm-apple.patch;

postPatch = ''
for a in */*-symbol-check ; do
patchShebangs $a
done
'';

preConfigure = stdenv.lib.optionalString stdenv.isDarwin
"echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache";

configureFlags = [ "--enable-install-test-programs" ]
++ stdenv.lib.optionals (stdenv.isAarch32 || stdenv.isAarch64)
[ "--enable-tegra-experimental-api" "--enable-etnaviv-experimental-api" ]

This file was deleted.

This file was deleted.

@@ -19,8 +19,6 @@ in stdenv.mkDerivation rec {
fetchSubmodules = true;
};

patches = [ ./darwin-fix-clock-gettime.patch ];

enableParallelBuilding = true;

meta = with stdenv.lib; {

This file was deleted.

@@ -93,7 +93,7 @@ let self = stdenv.mkDerivation {
./symlink-drivers.patch
./missing-includes.patch # dev_t needs sys/stat.h, time_t needs time.h, etc.-- fixes build w/musl
./disk_cache-include-dri-driver-path-in-cache-key.patch
] ++ lib.optional stdenv.isDarwin ./darwin-clock-gettime.patch;
];

outputs = [ "out" "dev" "drivers" ]
++ lib.optional (elem "swrast" galliumDrivers) "osmesa";
@@ -51,29 +51,17 @@ let
patches = {
qtbase = [
./qtbase.patch
./qtbase-darwin.patch
./qtbase-revert-no-macos10.10.patch
./qtbase-fixguicmake.patch
] ++ optionals stdenv.isDarwin [
./qtbase-darwin-nseventtype.patch
./qtbase-darwin-revert-69221.patch
];
qtdeclarative = [ ./qtdeclarative.patch ];
qtscript = [ ./qtscript.patch ];
qtserialport = [ ./qtserialport.patch ];
qttools = [ ./qttools.patch ];
qtwebengine = [ ./qtwebengine-no-build-skip.patch ]
++ optional stdenv.cc.isClang ./qtwebengine-clang-fix.patch
++ optionals stdenv.isDarwin [
./qtwebengine-darwin-no-platform-check.patch
./qtwebengine-darwin-sdk-10.10.patch
./qtwebengine-darwin-old-sdk.patch
];
qtwebkit = [ ./qtwebkit.patch ]
++ optionals stdenv.isDarwin [
./qtwebkit-darwin-no-readline.patch
./qtwebkit-darwin-no-qos-classes.patch
];
qtwebengine = [
./qtwebengine-no-build-skip.patch
./qtwebengine-darwin-no-platform-check.patch
];
qtwebkit = [ ./qtwebkit.patch ];
};

mkDerivation =

This file was deleted.

0 comments on commit 0fe315c

Please sign in to comment.
You can’t perform that action at this time.