JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xygrib: fix build failure due to openjpeg update

Browse Source
This commit is contained in:
Sandro Jäckel 2021-02-14 09:48:00 +01:00
parent c4419e6264
commit 31124e17eb
No known key found for this signature in database
GPG Key ID: 3AF5A43A3EECC2E5
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/misc/xygrib/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, wrapQtAppsHook, cmake, bzip2, qtbase, qttools, libnova, proj, libpng, openjpeg } : { lib, stdenv, fetchFromGitHub, wrapQtAppsHook, cmake, bzip2, qtbase, qttools, libnova, proj, libpng, openjpeg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.2.6.1"; version = "1.2.6.1";
@ -13,10 +13,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake qttools wrapQtAppsHook ]; nativeBuildInputs = [ cmake qttools wrapQtAppsHook ];
buildInputs = [ bzip2 qtbase libnova proj openjpeg libpng ]; buildInputs = [ bzip2 qtbase libnova proj openjpeg libpng ];
cmakeFlags = [ "-DOPENJPEG_INCLUDE_DIR=${openjpeg.dev}/include/openjpeg-2.3" ] cmakeFlags = [ "-DOPENJPEG_INCLUDE_DIR=${openjpeg.dev}/include/openjpeg-${lib.versions.majorMinor openjpeg.version}" ]
++ lib.optionals stdenv.isDarwin [ "-DLIBNOVA_LIBRARY=${libnova}/lib/libnova.dylib" ]; ++ lib.optionals stdenv.isDarwin [ "-DLIBNOVA_LIBRARY=${libnova}/lib/libnova.dylib" ];
postInstall = if stdenv.isDarwin then '' postInstall =
if stdenv.isDarwin then ''
mkdir -p "$out/Applications" "$out/XyGrib/XyGrib.app/Contents/Resources" mkdir -p "$out/Applications" "$out/XyGrib/XyGrib.app/Contents/Resources"
cp "../data/img/xyGrib.icns" "$out/XyGrib/XyGrib.app/Contents/Resources/xyGrib.icns" cp "../data/img/xyGrib.icns" "$out/XyGrib/XyGrib.app/Contents/Resources/xyGrib.icns"
mv $out/XyGrib/XyGrib.app $out/Applications mv $out/XyGrib/XyGrib.app $out/Applications
@ -30,9 +31,11 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
homepage = "https://opengribs.org"; homepage = "https://opengribs.org";
description = "Weather Forecast Visualization"; description = "Weather Forecast Visualization";
longDescription = ''XyGrib is a leading opensource weather visualization package. longDescription = ''
XyGrib is a leading opensource weather visualization package.
It interacts with OpenGribs's Grib server providing a choice It interacts with OpenGribs's Grib server providing a choice
of global and large area atmospheric and wave models.''; of global and large area atmospheric and wave models.
'';
license = licenses.gpl3; license = licenses.gpl3;
platforms = platforms.all; platforms = platforms.all;
maintainers = with maintainers; [ j03 SuperSandro2000 ]; maintainers = with maintainers; [ j03 SuperSandro2000 ];