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

Small fixes

Browse Source
This commit is contained in:
Matthew Pickering 2018-08-12 10:36:43 +01:00
parent bcab40610b
commit 5caa3fcae9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/gis/saga/default.nix
View File

@ -1,13 +1,13 @@
{ stdenv, fetchurl, gdal, wxGTK30, proj, libiodbc, lzma, jasper, { stdenv, fetchurl, gdal, wxGTK30, proj, libiodbc, lzma, jasper,
libharu, opencv, vigra, postgresql, Cocoa, libharu, opencv, vigra, postgresql, Cocoa,
unixODBC , poppler, hdf4, hdf5, netcdf, sqlite }: unixODBC , poppler, hdf4, hdf5, netcdf, sqlite, qhull }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "saga-6.3.0"; name = "saga-6.3.0";
# See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs # See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs
# for why the have additional buildInputs on darwin # for why the have additional buildInputs on darwin
buildInputs = [ gdal wxGTK30 proj libharu opencv vigra postgresql libiodbc lzma jasper ] buildInputs = [ gdal wxGTK30 proj libharu opencv vigra postgresql libiodbc lzma jasper qhull ]
++ stdenv.lib.optionals stdenv.isDarwin ++ stdenv.lib.optionals stdenv.isDarwin
[ Cocoa unixODBC poppler hdf4.out hdf5 netcdf sqlite ]; [ Cocoa unixODBC poppler hdf4.out hdf5 netcdf sqlite ];

2
pkgs/desktops/gnome-2/platform/GConf/default.nix
View File

@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://projects.gnome.org/gconf/; homepage = https://projects.gnome.org/gconf/;
description = "Deprecated system for storing application preferences"; description = "Deprecated system for storing application preferences";
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }