Merge pull request #197759 from wegank/opencpn-darwin

pkgs/applications/misc/opencpn/default.nix

@@ -1,10 +1,12 @@
-{ stdenv, lib
+{ stdenv
+, lib
 , alsa-utils
 , at-spi2-core
 , cmake
 , curl
 , dbus
 , fetchFromGitHub
+, fetchpatch
 , flac
 , gtk3
 , jasper
@@ -26,6 +28,7 @@
 , libxkbcommon
 , lsb-release
 , lz4
+, makeWrapper
 , pcre
 , pkg-config
 , portaudio
@@ -33,7 +36,7 @@
 , tinyxml
 , udev
 , util-linux
-, wxGTK31-gtk3
+, wxGTK32
 , xorg
 }:
 
@@ -48,9 +51,32 @@ stdenv.mkDerivation rec {
     hash = "sha256-sNZYf/2gtjRrrGPuazVnKTgcuIQpKPazhexqlK21T4g=";
   };
 
-  nativeBuildInputs = [ cmake lsb-release pkg-config ];
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/OpenCPN/OpenCPN/commit/30fa16850ba97d3df0622273947e3e3975b8e6c0.patch";
+      sha256 = "sha256-Sb4FE9QJA5kMJi52/x1Az6rMTS3WSURPx4QAhcv2j9E=";
+    })
+  ];
+
+  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 = [
+    cmake
+    pkg-config
+  ] ++ lib.optionals stdenv.isLinux [
+    lsb-release
+  ] ++ lib.optionals stdenv.isDarwin [
+    makeWrapper
+  ];
+
   buildInputs = [
-    alsa-utils
     at-spi2-core
     curl
     dbus
@@ -65,8 +91,6 @@ stdenv.mkDerivation rec {
     libexif
     libogg
     libopus
-    libselinux
-    libsepol
     libsndfile
     libthai
     libunarr
@@ -78,23 +102,36 @@ stdenv.mkDerivation rec {
     portaudio
     sqlite
     tinyxml
+    wxGTK32
+  ] ++ lib.optionals stdenv.isLinux [
+    alsa-utils
+    libselinux
+    libsepol
     udev
     util-linux
-    wxGTK31-gtk3
     xorg.libXdmcp
     xorg.libXtst
   ];
 
-
   cmakeFlags = [ "-DOCPN_BUNDLE_DOCS=true" ];
 
+  NIX_CFLAGS_COMPILE = lib.optionals (!stdenv.hostPlatform.isx86) [
+    "-DSQUISH_USE_SSE=0"
+  ];
+
+  postInstall = lib.optionals stdenv.isDarwin ''
+    mkdir -p $out/Applications
+    mv $out/bin/OpenCPN.app $out/Applications
+    makeWrapper $out/Applications/OpenCPN.app/Contents/MacOS/OpenCPN $out/bin/opencpn
+  '';
+
   doCheck = true;
 
   meta = with lib; {
     description = "A concise ChartPlotter/Navigator";
     maintainers = with maintainers; [ kragniz lovesegfault ];
-    platforms = [ "x86_64-linux" ];
-    license = licenses.gpl2;
+    platforms = platforms.unix;
+    license = licenses.gpl2Plus;
     homepage = "https://opencpn.org/";
   };
 }

pkgs/development/libraries/libunarr/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, cmake }:
+{ lib, stdenv, fetchurl, fetchpatch, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "libunarr";
@@ -16,11 +16,16 @@ stdenv.mkDerivation rec {
     substituteInPlace pkg-config.pc.cmake \
       --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \
       --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@
+  ''
+  # ld: unknown option: --no-undefined
+  + lib.optionalString stdenv.isDarwin ''
+    substituteInPlace CMakeLists.txt \
+      --replace '-Wl,--no-undefined -Wl,--as-needed' '-Wl,-undefined,error'
   '';
 
   meta = with lib; {
     homepage = "https://github.com/selmf/unarr";
     description = "A lightweight decompression library with support for rar, tar and zip archives";
-    license = licenses.lgpl3;
+    license = licenses.lgpl3Plus;
   };
 }