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

Merge pull request #39125 from mpickering/darwin-saga

Browse Source 
SAGA, SAGA LTS release, dependencies and QGIS SAGA plugin
This commit is contained in:
Michael Raskin
2018-10-14 19:14:48 +00:00
committed by GitHub
parent cbaf6673d6 1c9af2d89c
commit 878c6c090d
11 changed files with 166 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/libharu/default.nix
View File

@@ -15,6 +15,6 @@ stdenv.mkDerivation {
homepage = http://libharu.org/;
license = stdenv.lib.licenses.zlib;
maintainers = [ stdenv.lib.maintainers.marcweber ];
platforms = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.unix;
};
}

7
pkgs/development/libraries/libiodbc/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gtk2, useGTK ? false }:
{ stdenv, fetchurl, pkgconfig, gtk2, Carbon, useGTK ? false }:
stdenv.mkDerivation rec {
name = "libiodbc-3.52.12";
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = stdenv.lib.optionals useGTK [ gtk2 ];
buildInputs = stdenv.lib.optionals useGTK [ gtk2 ]
++ stdenv.lib.optional stdenv.isDarwin Carbon;
preBuild =
''
@@ -19,6 +20,6 @@ stdenv.mkDerivation rec {
meta = {
description = "iODBC driver manager";
homepage = http://www.iodbc.org;
platforms = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.unix;
};
}

8
pkgs/development/libraries/vigra/default.nix
View File

@@ -15,6 +15,12 @@ in stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
# Fixes compilation with clang (on darwin) see https://github.com/ukoethe/vigra/issues/414
patches =
let clangPatch = fetchurl { url = "https://github.com/ukoethe/vigra/commit/81958d302494e137f98a8b1d7869841532f90388.patch";
sha256 = "1i1w6smijgb5z8bg9jaq84ccy00k2sxm87s37lgjpyix901gjlgi"; };
in [ clangPatch ];
buildInputs = [ boost cmake fftw fftwSinglePrec hdf5 ilmbase libjpeg libpng
libtiff numpy openexr python ];
@@ -34,6 +40,6 @@ in stdenv.mkDerivation rec {
homepage = https://hci.iwr.uni-heidelberg.de/vigra;
license = licenses.mit;
maintainers = [ maintainers.viric ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}