tobias/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-11-10 01:33:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

qt5.*: use default SDK on Darwin (14.4)

Browse source
This commit is contained in:
Randy Eckenrode 2025-09-22 18:53:09 -04:00
parent 968bc7dfb4
commit f6b75da2d5
No known key found for this signature in database
GPG key ID: 64C1CD4EC2A600D9
2 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -17,7 +17,6 @@
python3, python3,
which, which,
# darwin support # darwin support
apple-sdk_14,
xcbuild, xcbuild,
dbus, dbus,
@ -86,11 +85,6 @@ let
"linux-generic-g++" "linux-generic-g++"
else else
throw "Please add a qtPlatformCross entry for ${plat.config}"; throw "Please add a qtPlatformCross entry for ${plat.config}";
# Per https://doc.qt.io/qt-5/macos.html#supported-versions: build SDK = 13.x or 14.x.
darwinVersionInputs = [
apple-sdk_14
];
in in
stdenv.mkDerivation ( stdenv.mkDerivation (
@ -153,7 +147,6 @@ stdenv.mkDerivation (
++ lib.optionals (!stdenv.hostPlatform.isDarwin) ( ++ lib.optionals (!stdenv.hostPlatform.isDarwin) (
lib.optional withLibinput libinput ++ lib.optional withGtk3 gtk3 lib.optional withLibinput libinput ++ lib.optional withGtk3 gtk3
) )
++ lib.optional stdenv.hostPlatform.isDarwin darwinVersionInputs
++ lib.optional developerBuild gdb ++ lib.optional developerBuild gdb
++ lib.optional (cups != null) cups ++ lib.optional (cups != null) cups
++ lib.optional mysqlSupport libmysqlclient ++ lib.optional mysqlSupport libmysqlclient

8
pkgs/development/libraries/qt-5/qtModule.nix
View file

@ -3,7 +3,6 @@
stdenv, stdenv,
buildPackages, buildPackages,
mkDerivation, mkDerivation,
apple-sdk_14,
perl, perl,
qmake, qmake,
patches, patches,
@ -29,12 +28,7 @@ mkDerivation (
inherit pname version src; inherit pname version src;
patches = (args.patches or [ ]) ++ (patches.${pname} or [ ]); patches = (args.patches or [ ]) ++ (patches.${pname} or [ ]);
buildInputs = buildInputs = args.buildInputs or [ ];
args.buildInputs or [ ]
# Per https://doc.qt.io/qt-5/macos.html#supported-versions
++ lib.optionals stdenv.hostPlatform.isDarwin [
apple-sdk_14
];
nativeBuildInputs = nativeBuildInputs =
(args.nativeBuildInputs or [ ]) (args.nativeBuildInputs or [ ])