Merge pull request #305638 from Kupac/fix_rsbml

rPackages.rsbml: fix build

authored by Justin Bedő and committed by GitHub 0d3377a6 78c337ec

+60
+58
pkgs/by-name/li/libsbml/package.nix
···
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchFromGitHub, 5 + fetchpatch, 6 + cmake, 7 + pkg-config, 8 + bzip2, 9 + libxml2, 10 + swig, 11 + }: 12 + stdenv.mkDerivation (attrs: { 13 + pname = "libsbml"; 14 + version = "5.20.2"; 15 + 16 + src = fetchFromGitHub { 17 + owner = "sbmlteam"; 18 + repo = "libsbml"; 19 + rev = "v${attrs.version}"; 20 + hash = "sha256-8JT2r0zuf61VewtZaOAccaOUmDlQPnllA0fXE9rT5X8="; 21 + }; 22 + 23 + patches = [ 24 + # This should be in next release, remember to remove fetchpatch 25 + (fetchpatch { 26 + name = "fix-xmlerror-conversion.patch"; 27 + url = "https://github.com/sbmlteam/libsbml/pull/358.patch"; 28 + hash = "sha256-uirG6XJ+w0hqBUEAGDnzhHoVtJVRdN1eqBYeneKMBao="; 29 + }) 30 + ]; 31 + 32 + nativeBuildInputs = [ 33 + cmake 34 + pkg-config 35 + swig 36 + ]; 37 + 38 + buildInputs = [ 39 + bzip2.dev 40 + libxml2 41 + ]; 42 + 43 + # libSBML doesn't always make use of pkg-config 44 + cmakeFlags = [ 45 + "-DLIBXML_INCLUDE_DIR=${lib.getDev libxml2}/include/libxml2" 46 + "-DLIBXML_LIBRARY=${lib.getLib libxml2}/lib/libxml2${stdenv.hostPlatform.extensions.sharedLibrary}" 47 + "-DPKG_CONFIG_EXECUTABLE=${lib.getBin pkg-config}/bin/pkg-config" 48 + "-DSWIG_EXECUTABLE=${lib.getBin swig}/bin/swig" 49 + ]; 50 + 51 + meta = with lib; { 52 + description = "Library for manipulating Systems Biology Markup Language (SBML)"; 53 + homepage = "https://github.com/sbmlteam/libsbml"; 54 + license = licenses.lgpl21Only; 55 + maintainers = [maintainers.kupac]; 56 + platforms = platforms.all; 57 + }; 58 + })
+2
pkgs/development/r-modules/default.nix
··· 380 LOMAR = [ pkgs.gmp.dev ]; 381 lpsymphony = with pkgs; [ pkg-config gfortran gettext ]; 382 lwgeom = with pkgs; [ proj geos gdal ]; 383 rvg = [ pkgs.libpng.dev ]; 384 MAGEE = [ pkgs.zlib.dev pkgs.bzip2.dev ]; 385 magick = [ pkgs.imagemagick.dev ]; ··· 589 gdtools = [ pkgs.pkg-config ]; 590 archive = [ pkgs.libarchive]; 591 gdalcubes = with pkgs; [ proj.dev gdal sqlite.dev netcdf ]; 592 SuperGauss = [ pkgs.pkg-config pkgs.fftw.dev]; 593 specklestar = [ pkgs.fftw.dev ]; 594 cartogramR = [ pkgs.fftw.dev ];
··· 380 LOMAR = [ pkgs.gmp.dev ]; 381 lpsymphony = with pkgs; [ pkg-config gfortran gettext ]; 382 lwgeom = with pkgs; [ proj geos gdal ]; 383 + rsbml = [ pkgs.pkg-config ]; 384 rvg = [ pkgs.libpng.dev ]; 385 MAGEE = [ pkgs.zlib.dev pkgs.bzip2.dev ]; 386 magick = [ pkgs.imagemagick.dev ]; ··· 590 gdtools = [ pkgs.pkg-config ]; 591 archive = [ pkgs.libarchive]; 592 gdalcubes = with pkgs; [ proj.dev gdal sqlite.dev netcdf ]; 593 + rsbml = [ pkgs.libsbml ]; 594 SuperGauss = [ pkgs.pkg-config pkgs.fftw.dev]; 595 specklestar = [ pkgs.fftw.dev ]; 596 cartogramR = [ pkgs.fftw.dev ];