diff options
| -rw-r--r-- | pkgs/applications/misc/opencpn/default.nix | 39 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 23 insertions, 20 deletions
diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix index 313f61e28ce0..89d656798008 100644 --- a/pkgs/applications/misc/opencpn/default.nix +++ b/pkgs/applications/misc/opencpn/default.nix @@ -7,15 +7,17 @@ , cmake , curl , dbus +, elfutils , fetchFromGitHub -, fetchpatch , flac , gtk3 +, glew +, gtest , jasper +, lame , libGLU , libarchive , libdatrie -, libelf , libepoxy , libexif , libogg @@ -30,10 +32,13 @@ , libxkbcommon , lsb-release , lz4 +, libmpg123 , makeWrapper , pcre +, pcre2 , pkg-config , portaudio +, rapidjson , sqlite , tinyxml , udev @@ -42,31 +47,25 @@ , xorg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "opencpn"; - version = "5.6.2"; + version = "5.8.4"; src = fetchFromGitHub { owner = "OpenCPN"; repo = "OpenCPN"; - rev = "Release_${version}"; - hash = "sha256-sNZYf/2gtjRrrGPuazVnKTgcuIQpKPazhexqlK21T4g="; + rev = "Release_${finalAttrs.version}"; + hash = "sha256-axRI3sssj2Q6IBfIeyvOa494b0EgKFP+lFL/QrGIybQ="; }; - patches = [ - (fetchpatch { - url = "https://github.com/OpenCPN/OpenCPN/commit/30fa16850ba97d3df0622273947e3e3975b8e6c0.patch"; - sha256 = "sha256-Sb4FE9QJA5kMJi52/x1Az6rMTS3WSURPx4QAhcv2j9E="; - }) - ]; - postPatch = lib.optionalString stdenv.isDarwin '' - sed -i '/fixup_bundle/d' CMakeLists.txt + sed -i '/fixup_bundle/d; /NO_DEFAULT_PATH/d' CMakeLists.txt ''; nativeBuildInputs = [ cmake pkg-config + gtest ] ++ lib.optionals stdenv.isLinux [ lsb-release ] ++ lib.optionals stdenv.isDarwin [ @@ -80,15 +79,14 @@ stdenv.mkDerivation rec { dbus flac ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ - # gtk3 propagates AppKit from the 10.12 SDK AppKit ] ++ [ gtk3 + glew jasper libGLU libarchive libdatrie - libelf libepoxy libexif libogg @@ -100,19 +98,24 @@ stdenv.mkDerivation rec { libvorbis libxkbcommon lz4 + libmpg123 pcre + pcre2 portaudio + rapidjson sqlite tinyxml wxGTK32 ] ++ lib.optionals stdenv.isLinux [ alsa-utils + elfutils libselinux libsepol - udev util-linux xorg.libXdmcp xorg.libXtst + ] ++ lib.optionals stdenv.isDarwin [ + lame ]; cmakeFlags = [ "-DOCPN_BUNDLE_DOCS=true" ]; @@ -136,4 +139,4 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; homepage = "https://opencpn.org/"; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fcf05e9b81ce..ff95d4ce7626 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34372,9 +34372,9 @@ with pkgs; openbrf = libsForQt5.callPackage ../applications/misc/openbrf { }; - opencpn = darwin.apple_sdk_11_0.callPackage ../applications/misc/opencpn { + opencpn = callPackage ../applications/misc/opencpn { inherit (darwin) DarwinTools; - inherit (darwin.apple_sdk_11_0.frameworks) AppKit; + inherit (darwin.apple_sdk.frameworks) AppKit; }; openfx = callPackage ../development/libraries/openfx { }; |