Commit Graph

1103 Commits

Author SHA1 Message Date
Emily
8aaea3781c libsForQt5.*: don’t propagate Darwin version inputs 2024-11-03 01:30:28 +00:00
Emily
4e3c8f45a5 libsForQt5.*: consistently build with the macOS 13 SDK
This was changed for `qtbase` in
3be309eff1, but affects Qt WebEngine
as well.
2024-11-03 01:30:27 +00:00
Emily
3831685684 libsForQt5.qtbase: override the Darwin deployment target correctly
There might be a nicer way to do this, but I don’t understand qmake.
2024-10-28 22:39:26 +00:00
Emily
3be309eff1 libsForQt5.qtbase: use the macOS 13 SDK 2024-10-28 22:39:26 +00:00
Emily
d85a1e50fe libsForQt5.qtbase: fix Darwin build by removing obsolete patches
Another existing bug exposed by
514b00cf08: the build system was
interpolating an empty SDK directory and passing `-isysroot  -g0`,
eating a compiler flag and breaking the build now that we don’t
pass a redundant `-isysroot` of our own.

Thankfully, with the new SDK pattern, we don’t need to do any of
this elaborate patching; just pointing it at the right tools from
`xcbuild` lets it figure everything out itself.
2024-10-28 22:39:26 +00:00
Randy Eckenrode
61d0e51c9c
qt5.qtwebengine: use the 13.3 SDK because the 14.4 SDK does not work
While the 14.4 SDK works to build the rest of Qt 5, building Qt
WebEngine fails with errors like the following:

    In file included from gen/base/base_jumbo_37.cc:14:
    In file included from ./../../3rdparty/chromium/base/mac/mach_port_rendezvous.cc:16:
    In file included from ../../3rdparty/chromium/base/mac/foundation_util.h:34:
    In file included from /nix/store/sfdyfscmykycv7nfscn551lyl3gf4n27-apple-sdk-14.4/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/ApplicationServices.framework/Headers/ApplicationServices.h:39:
    In file included from /nix/store/sfdyfscmykycv7nfscn551lyl3gf4n27-apple-sdk-14.4/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreText.framework/Headers/CoreText.h:26:
    In file included from /nix/store/sfdyfscmykycv7nfscn551lyl3gf4n27-apple-sdk-14.4/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreText.framework/Headers/CTFramesetter.h:21:
    In file included from /nix/store/sfdyfscmykycv7nfscn551lyl3gf4n27-apple-sdk-14.4/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreText.framework/Headers/CTTypesetter.h:20:
    /nix/store/sfdyfscmykycv7nfscn551lyl3gf4n27-apple-sdk-14.4/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreText.framework/Headers/CTLine.h:138:5: error: unknown type name 'CFAttributedStringRef'; did you mean 'CFMutableStringRef'?
        CFAttributedStringRef attrString ) CT_AVAILABLE(macos(10.5), ios(3.2), watchos(2.0), tvos(9.0));
        ^
    /nix/store/sfdyfscmykycv7nfscn551lyl3gf4n27-apple-sdk-14.4/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreFoundation.framework/Headers/CFBase.h:500:70: note: 'CFMutableStringRef' declared here
    typedef struct CF_BRIDGED_MUTABLE_TYPE(NSMutableString) __CFString * CFMutableStringRef;
                                                                     ^
2024-10-10 01:06:45 -04:00
Randy Eckenrode
ab80059a1b
qt5.qtwebengine: drop overrideSDK
Qt is using the new Darwin SDK, which no longer requires overrideSDK to
change the SDK version or set the deployment target.
2024-10-10 01:06:45 -04:00
Randy Eckenrode
4bb131ec6b
qt5: build Qt 5 modules with the 14.4 SDK
This change ensures all Qt modules build with the latest SDK.
2024-10-10 01:06:45 -04:00
Randy Eckenrode
578b04cd1d
qt5.qtbase: build with the 14.4 SDK
Per upstream’s supported Darwin versions, built with the 14.4 SDK
(corresponding to Xcode 15) and a 10.14 deployment target. To ensure
that users of Qt have a compatible SDK and deployment target, propagate
the 10.14 SDK and a 10.14 minimum version. Users that need a newer
version can opt into using it by adding the SDK package to their build
inputs. aarch64-darwin uses 11.0 and 11.3 because those are the oldest
supported SDK and deployment target on that platform.

Note: upstream actually supports 10.13, but 10.14 was chosen as the
minimum and SDK because it ensures that automatic dark mode switching
works for x86_64-darwin users.
2024-10-10 01:06:44 -04:00
github-actions[bot]
e9c8665026
Merge master into staging-next 2024-10-05 00:14:01 +00:00
Peder Bergebakken Sundt
d6ca5ed287 treewide: remove empty build inputs
Done with

```sh
regex='\s*(nativeBuild|build|check|nativeCheck)Inputs *= *\[ *\];'
rg "^$regex$" -l | xe sd "\n\n$regex\n" "\n"
rg "^$regex$" -l | xe sd "\n$regex\n" "\n"
rg "^$regex$" -l | xe sd "\n$regex\n" "\n"
```
2024-10-04 19:03:59 +02:00
Artturin
f0e657f3b1 Merge branch 'master' into staging-next 2024-09-25 06:05:01 +03:00
Artturin
e0464e4788 treewide: replace stdenv.is with stdenv.hostPlatform.is
In preparation for the deprecation of `stdenv.isX`.

These shorthands are not conducive to cross-compilation because they
hide the platforms.

Darwin might get cross-compilation for which the continued usage of `stdenv.isDarwin` will get in the way

One example of why this is bad and especially affects compiler packages
https://www.github.com/NixOS/nixpkgs/pull/343059

There are too many files to go through manually but a treewide should
get users thinking when they see a `hostPlatform.isX` in a place where it
doesn't make sense.

```
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv.is" "stdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv'.is" "stdenv'.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "clangStdenv.is" "clangStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "gccStdenv.is" "gccStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenvNoCC.is" "stdenvNoCC.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "inherit (stdenv) is" "inherit (stdenv.hostPlatform) is"
fd --type f "\.nix" | xargs sd --fixed-strings "buildStdenv.is" "buildStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "effectiveStdenv.is" "effectiveStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "originalStdenv.is" "originalStdenv.hostPlatform.is"
```
2024-09-25 00:04:37 +03:00
Emily
61922738bb treewide: optimistically unpin FFmpeg 7 dependencies
Per the adjusted FFmpeg pinning advice, packages that work on the
default version should use the unversioned variants to ease the
migration to future versions and reduce the number of packages that
end up referencing old versions.

I have left HandBrake pinned as it builds a custom patched FFmpeg.
2024-09-07 20:31:41 +01:00
Philip Taron
4160ccc634
treewide: handle *Phases variables __structuredAttrs-agnostically (#339117) 2024-09-07 09:17:57 -07:00
K900
8d4d6a52a6
libsForQt5.qttools: Add option for building qdoc (#245379) 2024-09-06 16:38:55 +03:00
OPNA2608
954cea5708 libsForQt5.qttools: Add LLVM for qdoc
Since our Qt5 packaging uses outputs, we don't need to hide this behind an option like with Qt6.
2024-09-06 15:36:09 +02:00
K900
e8e964f492 qt5: 5.15.14 -> 5.15.15 2024-09-04 09:44:11 +03:00
Yueh-Shun Li
758056dac7 treewide: handle postPhases __structuredAttrs-agnostically
Always specify the postPhases attribute as a list instead of a string.

Append elements to the postPhases Bash variable using appendToVar
instead of string or Bash array concatenation.
2024-09-03 05:56:17 +08:00
Yueh-Shun Li
21c0129841 treewide: handle prePhases __structuredAttrs-agnostically
Always specify the prePhases attribute as a list instead of a string.

Append elements to the prePhases Bash variable using appendToVar
instead of string or Bash array concatenation.
2024-09-03 05:33:59 +08:00
Wolfgang Walther
1bcca7d66b
qt: support structuredAttrs in qmake hook
Tested qbs with and without __structuredAttrs.
2024-08-24 12:23:38 +02:00
Guilhem Saurel
2bca85a8d3 qt5.qtwebengine: fix darwin build for system ffmpeg 7
fix #332495
2024-08-09 13:31:04 +02:00
OPNA2608
62934e6bed libsForQt5.qttools: Reorder outputs vs propagatedBuildInputs
We usually order them the other way around.
2024-08-07 23:53:57 +02:00
OPNA2608
df8c7eaf8e libsForQt5.qttools: nixfmt 2024-08-07 22:39:00 +02:00
OPNA2608
27e56c9b6f libsForQt5.qttools: Move QT_HOST_DATA from sed calls to a patch 2024-08-07 22:37:18 +02:00
Emily
3be3946fc3 {qt5,qt6}.qtwebengine: add patches for FFmpeg 7
Thank you to the Arch package maintainer for incorporating the WebRTC
patches (which I had previously manually added) the day before I went
to clean this up for PRing!
2024-07-29 11:06:59 +01:00
Martin Weinelt
93f4195fe0
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/applications/graphics/seamly2d/default.nix
2024-07-26 18:05:04 +02:00
K900
8e7a098243 speechd: introduce minimal variant, use it everywhere 2024-07-26 15:48:11 +03:00
Sigmanificient
6dd44107ac treewide: remove unused lib (and other) arguments 2024-07-26 11:18:09 +02:00
K900
1410c766c8 Merge remote-tracking branch 'origin/master' into staging-next 2024-07-26 08:41:08 +03:00
Silvan Mosberger
14449c6e93
Merge pull request #324622 from philiptaron/__attrsFailEvaluation/qt5
qt5: remove __attrsFailEvaluation as all attrsets evaluate
2024-07-26 01:59:06 +02:00
Randy Eckenrode
f9b7f4ec09
tree-wide: use top-level cctools 2024-07-17 22:36:19 -04:00
Sigmanificient
512e8afdb9 treewide: remove unused occurence of stdenv (and other) arguments
format (will squash)
2024-07-14 04:32:56 +02:00
Philip Taron
1ba85e5fd5
qt5.srcs: remove __attrsFailEvaluation 2024-07-04 10:25:38 -07:00
Vladimír Čunát
36e613d0be
qt5.qtwebengine: patch to build with python 3.12
https://hydra.nixos.org/build/264588210/nixlog/1/tail
2024-07-01 12:51:05 +02:00
Martin Weinelt
9b79a05ae1
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/development/python-modules/flexcache/default.nix
- pkgs/development/python-modules/flexparser/default.nix
- pkgs/development/python-modules/odp-amsterdam/default.nix
- pkgs/development/python-modules/pint/default.nix
- pkgs/development/python-modules/uncertainties/default.nix
- pkgs/top-level/python-packages.nix
2024-07-01 01:07:21 +02:00
OPNA2608
cd6462bae2 libsForQt5.qtsystems: Fetch patch to fix crash on XOpenDisplay failure
Fixes some apps crashing in an X11-less context (morph-browser when launched via content-hub, lomiri-clock-app via lomiri-url-dispatcher).
2024-06-29 23:33:42 +02:00
Emily
8696744ce9 treewide: clean up uses of lib{GL,GLU,glut}.dev
These were now broken on Darwin; most of them were unnecessary,
but best practice for the remaining ones is to use `lib.getDev`.
2024-06-22 18:06:51 +01:00
github-actions[bot]
da355608e2
Merge staging-next into staging 2024-06-12 12:01:37 +00:00
K900
b6924cdafe qt5.qtlocation: fix build on Darwin
Well, "fix", because this just allows us to use deprecated C++ features
for now, and the actual consumer of said features is boost 1.65.1,
vendored inside mapbox-gl, vendored inside qtlocation, with all the
upstreams in this chain being mostly dead.

Anyway, this should buy us time until the next libcxx bump comes around,
and then we'll have to send qt5location to a farm upstate unless someone
wants to go through the entire boost codebase and precision-upgrade it.
2024-06-12 09:41:20 +03:00
github-actions[bot]
c8c2ff3b9b
Merge staging-next into staging 2024-06-10 00:02:49 +00:00
Alyssa Ross
3df6bb2c85
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/applications/blockchains/polkadot/default.nix
2024-06-09 22:47:12 +01:00
Alexis Hildebrandt
755b915a15 treewide: Remove indefinite article from meta.description
nix run nixpkgs#silver-searcher -- -G '\.nix$' -0l 'description.*"[Aa]n?' pkgs \
  | xargs -0 nix run nixpkgs#gnused -- -i '' -Ee 's/(description.*")[Aa]n? (.)/\1\U\2/'
2024-06-09 23:07:45 +02:00
K900
e532cb8e4e qt5.qtbase: refresh patchset, drop vendored patch copy
Going to staging because we don't want qtbase rebuilds on Linux on -next at this point.
2024-06-06 17:22:39 +03:00
K900
7d9f435066 qt5.qtbase: cherry-pick build fix for Darwin 2024-06-06 11:19:45 +03:00
K900
7ab1719f86 qt5: 5.15.12 -> 5.15.14, 5.15.16 -> 5.15.17
Also drop a bunch of QtWebEngine Python3 stuff since it's now upstream.
2024-06-05 17:27:05 +03:00
Vladimír Čunát
5804775d03
Merge branch 'staging' into staging-next 2024-05-31 07:30:41 +02:00
Randy Eckenrode
4bb545d1c7
qt5.qtwebengine: fix build with Ninja 1.12 2024-05-29 23:58:23 -04:00
Weijia Wang
fc37780866 qt5.qtwayland: restrict platforms 2024-05-29 22:54:46 +02:00
Yohann Boniface
d20a86ccc1
pkgs/development/libraries: remove unused fetchpatch and other arguments (#313402) 2024-05-23 13:43:35 +02:00