Merge pull request #207922 from wegank/opencpn-darwin

This commit is contained in:
Sandro 2023-01-08 23:46:22 +01:00 committed by GitHub
commit 5987bbc90c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 6 deletions

View file

@ -1,5 +1,7 @@
{ stdenv
, lib
, AppKit
, DarwinTools
, alsa-utils
, at-spi2-core
, cmake
@ -59,12 +61,7 @@ stdenv.mkDerivation rec {
];
postPatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace cmake/TargetSetup.cmake \
--replace '"sw_vers" "-productVersion"' '"echo" "1"'
sed -i '/fixup_bundle/d' CMakeLists.txt
'' + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) ''
substituteInPlace CMakeLists.txt \
--replace 'DARWIN_VERSION LESS 16' 'TRUE'
'';
nativeBuildInputs = [
@ -73,6 +70,7 @@ stdenv.mkDerivation rec {
] ++ lib.optionals stdenv.isLinux [
lsb-release
] ++ lib.optionals stdenv.isDarwin [
DarwinTools
makeWrapper
];
@ -81,6 +79,10 @@ stdenv.mkDerivation rec {
curl
dbus
flac
] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
# gtk3 propagates AppKit from the 10.12 SDK
AppKit
] ++ [
gtk3
jasper
libGLU

View file

@ -31407,7 +31407,10 @@ with pkgs;
openbrf = libsForQt5.callPackage ../applications/misc/openbrf { };
opencpn = callPackage ../applications/misc/opencpn { };
opencpn = darwin.apple_sdk_11_0.callPackage ../applications/misc/opencpn {
inherit (darwin) DarwinTools;
inherit (darwin.apple_sdk_11_0.frameworks) AppKit;
};
openfx = callPackage ../development/libraries/openfx {};