Fix grass build on darwin

+42 -1
+5 -1
pkgs/applications/gis/grass/default.nix
··· 1 1 { stdenv, fetchurl, flex, bison, pkgconfig, zlib, libtiff, libpng, fftw 2 2 , cairo, readline, ffmpeg, makeWrapper, wxGTK30, netcdf, blas 3 - , proj, gdal, geos, sqlite, postgresql, mysql, python2Packages 3 + , proj, gdal, geos, sqlite, postgresql, mysql, python2Packages, lib 4 4 }: 5 5 6 6 stdenv.mkDerivation { ··· 14 14 buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite cairo 15 15 readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql mysql.connector-c blas ] 16 16 ++ (with python2Packages; [ python dateutil wxPython30 numpy ]); 17 + 18 + # On Darwin the installer tries to symlink the help files into a system 19 + # directory 20 + patches = [] ++ lib.optional stdenv.isDarwin [ ./no_symbolic_links.patch ]; 17 21 18 22 configureFlags = [ 19 23 "--with-proj-share=${proj}/share/proj"
+37
pkgs/applications/gis/grass/no_symbolic_links.patch
··· 1 + diff --git a/include/Make/Install.make b/include/Make/Install.make 2 + index 0aba138..8ba74bc 100644 3 + --- a/include/Make/Install.make 4 + +++ b/include/Make/Install.make 5 + @@ -116,11 +116,6 @@ real-install: | $(INST_DIR) $(UNIX_BIN) 6 + -$(INSTALL) config.status $(INST_DIR)/config.status 7 + -$(CHMOD) -R a+rX $(INST_DIR) 2>/dev/null 8 + 9 + -ifneq ($(findstring darwin,$(ARCH)),) 10 + - @# enable OSX Help Viewer 11 + - @/bin/ln -sfh "$(INST_DIR)/docs/html" /Library/Documentation/Help/GRASS-$(GRASS_VERSION_MAJOR).$(GRASS_VERSION_MINOR) 12 + -endif 13 + - 14 + $(INST_DIR) $(UNIX_BIN): 15 + $(MAKE_DIR_CMD) $@ 16 + 17 + diff --git a/macosx/app/build_html_user_index.sh b/macosx/app/build_html_user_index.sh 18 + index 04e63eb..c9d9c2c 100755 19 + --- a/macosx/app/build_html_user_index.sh 20 + +++ b/macosx/app/build_html_user_index.sh 21 + @@ -140,7 +140,6 @@ else 22 + # echo "<tr><td valign=\"top\"><a href=\"$HTMLDIRG/$i\">$BASENAME</a></td> <td>$SHORTDESC</td></tr>" >> $FULLINDEX 23 + # make them local to user to simplify page links 24 + echo "<tr><td valign=\"top\"><a href=\"global_$i\">$BASENAME</a></td> <td>$SHORTDESC</td></tr>" >> $FULLINDEX 25 + - ln -sf "$HTMLDIRG/$i" global_$i 26 + done 27 + done 28 + fi 29 + @@ -183,8 +182,3 @@ echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\"> 30 + </html>" > $i.html 31 + done 32 + 33 + -# add Help Viewer links in user docs folder 34 + - 35 + -mkdir -p $HOME/Library/Documentation/Help/ 36 + -ln -sfh ../../GRASS/$GRASS_MMVER/Modules/docs/html $HOME/Library/Documentation/Help/GRASS-$GRASS_MMVER-addon 37 + -ln -sfh $GISBASE/docs/html $HOME/Library/Documentation/Help/GRASS-$GRASS_MMVER