lol

saga: 7.9.1 -> 8.4.0

+17 -20
+12 -16
pkgs/applications/gis/saga/default.nix
··· 3 3 , lib 4 4 , fetchurl 5 5 # native 6 - , autoreconfHook 6 + , cmake 7 7 , pkg-config 8 8 # not native 9 9 , gdal 10 - , wxGTK31 10 + , wxGTK32 11 11 , proj 12 12 , dxflib 13 13 , curl ··· 31 31 32 32 mkDerivation rec { 33 33 pname = "saga"; 34 - version = "7.9.1"; 34 + version = "8.4.0"; 35 35 36 36 src = fetchurl { 37 37 url = "mirror://sourceforge/saga-gis/SAGA%20-%20${lib.versions.major version}/SAGA%20-%20${version}/saga-${version}.tar.gz"; 38 - sha256 = "sha256-Jq1LhBSeJuq9SlNl/ko5I8+jnjZnLMfGYNNUnzVWo7w="; 38 + sha256 = "sha256-v6DPwV20fcsznrEaFJk0/ewU4z3cTjzYYuLkyMwSLV0="; 39 39 }; 40 40 41 + sourceRoot = "saga-${version}/saga-gis"; 42 + 41 43 nativeBuildInputs = [ 42 - # Upstream's gnerated ./configure is not reliable 43 - autoreconfHook 44 + cmake 44 45 pkg-config 45 46 ]; 46 - configureFlags = [ 47 - "--with-system-svm" 48 - # hdf is no detected otherwise 49 - "HDF5_LIBS=-l${hdf5}/lib" 50 - "HDF5_CFLAGS=-I${hdf5.dev}/include" 51 - ]; 47 + 52 48 buildInputs = [ 53 49 curl 54 50 dxflib ··· 56 52 libsvm 57 53 hdf5 58 54 gdal 59 - wxGTK31 55 + wxGTK32 60 56 proj 61 57 libharu 62 58 opencv ··· 77 73 sqlite 78 74 ]; 79 75 80 - enableParallelBuilding = true; 81 - 82 - CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11 -Wno-narrowing"; 76 + cmakeFlags = [ 77 + "-DOpenMP_SUPPORT=${if stdenv.isDarwin then "OFF" else "ON"}" 78 + ]; 83 79 84 80 meta = with lib; { 85 81 description = "System for Automated Geoscientific Analyses";
+5 -4
pkgs/development/libraries/dxflib/default.nix
··· 1 - { lib, stdenv 1 + { lib 2 + , stdenv 2 3 , fetchurl 3 4 , qmake 4 5 }: ··· 19 20 ''; 20 21 installPhase = '' 21 22 install -d -m 0755 $out/lib 22 - cp -pr *.so* $out/lib 23 + cp -pr *${stdenv.hostPlatform.extensions.sharedLibrary}* $out/lib 23 24 install -d -m 0755 $out/include/dxflib 24 25 cp -pr src/*.h $out/include/dxflib 25 26 # Generate pkg-config file ··· 39 40 40 41 meta = { 41 42 homepage = "https://qcad.org/en/90-dxflib"; 42 - maintainers = with lib.maintainers; [raskin]; 43 - platforms = lib.platforms.linux; 43 + maintainers = with lib.maintainers; [ raskin ]; 44 + platforms = lib.platforms.unix; 44 45 description = "DXF file format library"; 45 46 }; 46 47 }