diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2023-01-08 23:46:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-08 23:46:22 +0100 |
| commit | 5987bbc90cd8e33f14de545f961090d917e6c022 (patch) | |
| tree | 0f421e070eb11d0c69d50683cc0c72da601aaf4f | |
| parent | 4b7664384c7600dadb4dc8d1708626d073681b40 (diff) | |
| parent | c2ea89836082775acfef4beb4526a022e6ad656d (diff) | |
Merge pull request #207922 from wegank/opencpn-darwin
| -rw-r--r-- | pkgs/applications/misc/opencpn/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 11 insertions, 6 deletions
diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix index 590ca33045169..357f4fcd87e56 100644 --- a/pkgs/applications/misc/opencpn/default.nix +++ b/pkgs/applications/misc/opencpn/default.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fbab1e55ed560..7ff402cfd4f60 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 {}; |