opencpn: 5.6.2 -> 5.8.4
All added packages are from looking through the `configurePhase` output.
This commit is contained in:
parent
ac1638d014
commit
51d42151e2
|
@ -7,15 +7,17 @@
|
||||||
, cmake
|
, cmake
|
||||||
, curl
|
, curl
|
||||||
, dbus
|
, dbus
|
||||||
|
, elfutils
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, fetchpatch
|
|
||||||
, flac
|
, flac
|
||||||
, gtk3
|
, gtk3
|
||||||
|
, glew
|
||||||
|
, gtest
|
||||||
, jasper
|
, jasper
|
||||||
|
, lame
|
||||||
, libGLU
|
, libGLU
|
||||||
, libarchive
|
, libarchive
|
||||||
, libdatrie
|
, libdatrie
|
||||||
, libelf
|
|
||||||
, libepoxy
|
, libepoxy
|
||||||
, libexif
|
, libexif
|
||||||
, libogg
|
, libogg
|
||||||
|
@ -30,10 +32,13 @@
|
||||||
, libxkbcommon
|
, libxkbcommon
|
||||||
, lsb-release
|
, lsb-release
|
||||||
, lz4
|
, lz4
|
||||||
|
, libmpg123
|
||||||
, makeWrapper
|
, makeWrapper
|
||||||
, pcre
|
, pcre
|
||||||
|
, pcre2
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, portaudio
|
, portaudio
|
||||||
|
, rapidjson
|
||||||
, sqlite
|
, sqlite
|
||||||
, tinyxml
|
, tinyxml
|
||||||
, udev
|
, udev
|
||||||
|
@ -42,31 +47,25 @@
|
||||||
, xorg
|
, xorg
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
pname = "opencpn";
|
pname = "opencpn";
|
||||||
version = "5.6.2";
|
version = "5.8.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "OpenCPN";
|
owner = "OpenCPN";
|
||||||
repo = "OpenCPN";
|
repo = "OpenCPN";
|
||||||
rev = "Release_${version}";
|
rev = "Release_${finalAttrs.version}";
|
||||||
hash = "sha256-sNZYf/2gtjRrrGPuazVnKTgcuIQpKPazhexqlK21T4g=";
|
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 ''
|
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||||
sed -i '/fixup_bundle/d' CMakeLists.txt
|
sed -i '/fixup_bundle/d; /NO_DEFAULT_PATH/d' CMakeLists.txt
|
||||||
'';
|
'';
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cmake
|
cmake
|
||||||
pkg-config
|
pkg-config
|
||||||
|
gtest
|
||||||
] ++ lib.optionals stdenv.isLinux [
|
] ++ lib.optionals stdenv.isLinux [
|
||||||
lsb-release
|
lsb-release
|
||||||
] ++ lib.optionals stdenv.isDarwin [
|
] ++ lib.optionals stdenv.isDarwin [
|
||||||
|
@ -80,15 +79,14 @@ stdenv.mkDerivation rec {
|
||||||
dbus
|
dbus
|
||||||
flac
|
flac
|
||||||
] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
|
] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
|
||||||
# gtk3 propagates AppKit from the 10.12 SDK
|
|
||||||
AppKit
|
AppKit
|
||||||
] ++ [
|
] ++ [
|
||||||
gtk3
|
gtk3
|
||||||
|
glew
|
||||||
jasper
|
jasper
|
||||||
libGLU
|
libGLU
|
||||||
libarchive
|
libarchive
|
||||||
libdatrie
|
libdatrie
|
||||||
libelf
|
|
||||||
libepoxy
|
libepoxy
|
||||||
libexif
|
libexif
|
||||||
libogg
|
libogg
|
||||||
|
@ -100,19 +98,24 @@ stdenv.mkDerivation rec {
|
||||||
libvorbis
|
libvorbis
|
||||||
libxkbcommon
|
libxkbcommon
|
||||||
lz4
|
lz4
|
||||||
|
libmpg123
|
||||||
pcre
|
pcre
|
||||||
|
pcre2
|
||||||
portaudio
|
portaudio
|
||||||
|
rapidjson
|
||||||
sqlite
|
sqlite
|
||||||
tinyxml
|
tinyxml
|
||||||
wxGTK32
|
wxGTK32
|
||||||
] ++ lib.optionals stdenv.isLinux [
|
] ++ lib.optionals stdenv.isLinux [
|
||||||
alsa-utils
|
alsa-utils
|
||||||
|
elfutils
|
||||||
libselinux
|
libselinux
|
||||||
libsepol
|
libsepol
|
||||||
udev
|
|
||||||
util-linux
|
util-linux
|
||||||
xorg.libXdmcp
|
xorg.libXdmcp
|
||||||
xorg.libXtst
|
xorg.libXtst
|
||||||
|
] ++ lib.optionals stdenv.isDarwin [
|
||||||
|
lame
|
||||||
];
|
];
|
||||||
|
|
||||||
cmakeFlags = [ "-DOCPN_BUNDLE_DOCS=true" ];
|
cmakeFlags = [ "-DOCPN_BUNDLE_DOCS=true" ];
|
||||||
|
@ -136,4 +139,4 @@ stdenv.mkDerivation rec {
|
||||||
license = licenses.gpl2Plus;
|
license = licenses.gpl2Plus;
|
||||||
homepage = "https://opencpn.org/";
|
homepage = "https://opencpn.org/";
|
||||||
};
|
};
|
||||||
}
|
})
|
||||||
|
|
|
@ -34372,9 +34372,9 @@ with pkgs;
|
||||||
|
|
||||||
openbrf = libsForQt5.callPackage ../applications/misc/openbrf { };
|
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) DarwinTools;
|
||||||
inherit (darwin.apple_sdk_11_0.frameworks) AppKit;
|
inherit (darwin.apple_sdk.frameworks) AppKit;
|
||||||
};
|
};
|
||||||
|
|
||||||
openfx = callPackage ../development/libraries/openfx { };
|
openfx = callPackage ../development/libraries/openfx { };
|
||||||
|
|
Loading…
Reference in New Issue
Block a user