texmacs: remove darwin version, because it depends on qt4

and hasn't been updated since it was added to nixpkgs

ajs124 173409fb 85d2adb0

+4 -98
-60
pkgs/applications/editors/texmacs/darwin.nix
··· 1 - { lib, stdenv, callPackage, fetchurl, 2 - guile_1_8, qt4, zlib, freetype, CoreFoundation, Cocoa, gettext, libiconv, ghostscript, 3 - tex ? null, 4 - aspell ? null, 5 - netpbm ? null, 6 - imagemagick ? null, 7 - extraFonts ? false, 8 - chineseFonts ? false, 9 - japaneseFonts ? false, 10 - koreanFonts ? false }: 11 - let 12 - version = "1.99.4"; 13 - common = callPackage ./common.nix { 14 - inherit tex extraFonts chineseFonts japaneseFonts koreanFonts; 15 - }; 16 - in 17 - stdenv.mkDerivation { 18 - pname = "TeXmacs"; 19 - inherit version; 20 - 21 - src= fetchurl { 22 - url = "http://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz"; 23 - sha256 = "1z8sj0xd1ncbl7ipzfsib6lmc7ahgvmiw61ln5zxm2l88jf7qc1a"; 24 - }; 25 - 26 - patches = [ ./darwin.patch ]; 27 - 28 - buildInputs = [ guile_1_8.dev qt4 freetype CoreFoundation Cocoa gettext libiconv ghostscript ]; 29 - 30 - GUILE_CPPFLAGS="-D_THREAD_SAFE -I${guile_1_8.dev}/include -I${guile_1_8.dev}/include/guile "; 31 - 32 - NIX_LDFLAGS="${zlib}/lib/libz.dylib"; 33 - 34 - buildPhase = '' 35 - substituteInPlace Makefile \ 36 - --replace 'find -d $(MACOS_PACKAGE_TEXMACS)' 'find $(MACOS_PACKAGE_TEXMACS) -depth' \ 37 - --replace '$(MACOS_PACKAGE_SRC)/bundle-libs.sh' 'true' 38 - make MACOS_BUNDLE 39 - ''; 40 - 41 - installPhase = '' 42 - mkdir -p $out/Applications 43 - cp -R ../distr/TeXmacs-${version}.app $out/Applications 44 - ''; 45 - 46 - inherit (common) postPatch; 47 - 48 - postInstall = "wrapProgram $out/Applications/TeXmacs-${version}/Contents/MacOS/TeXmacs --suffix PATH : " + 49 - "${ghostscript}/bin:" + 50 - (lib.optionalString (aspell != null) "${aspell}/bin:") + 51 - (lib.optionalString (tex != null) "${tex}/bin:") + 52 - (lib.optionalString (netpbm != null) "${lib.getBin netpbm}/bin:") + 53 - (lib.optionalString (imagemagick != null) "${imagemagick}/bin:"); 54 - 55 - enableParallelBuilding = true; 56 - 57 - meta = common.meta // { 58 - platforms = lib.platforms.darwin; 59 - }; 60 - }
-29
pkgs/applications/editors/texmacs/darwin.patch
··· 1 - --- a/configure 2 - +++ b/configure 3 - @@ -7461,7 +7461,7 @@ $as_echo "final adjustments for cygwin host" >&6; } 4 - CONFIG_QTPIPES="yes" 5 - CONFIG_CXXFLAGS="-I${prefix}/include" 6 - CONFIG_BSHARED="" 7 - - CONFIG_BFLAGS="-framework Cocoa -framework IOKit" 8 - + CONFIG_BFLAGS="-framework Cocoa -framework IOKit -framework CoreFoundation" 9 - CONFIG_BPATH="" 10 - CONFIG_SO="dylib" 11 - CONFIG_LIB_PATH="DYLD_LIBRARY_PATH" 12 - @@ -8281,6 +8281,7 @@ _ASEOF 13 - if $QMAKE ${additional_qmake_flags} ; then :; else 14 - as_fn_error $? "Calling $QMAKE failed." "$LINENO" 5 15 - fi 16 - + echo "QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.10" >> $pro_file 17 - # Try to compile a simple Qt app. 18 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can build a simple Qt app" >&5 19 - $as_echo_n "checking whether we can build a simple Qt app... " >&6; } 20 - --- a/src/Plugins/Unix/unix_sys_utils.cpp 21 - +++ b/src/Plugins/Unix/unix_sys_utils.cpp 22 - @@ -17,6 +17,7 @@ 23 - #include <spawn.h> 24 - #include <unistd.h> 25 - #include <sys/wait.h> 26 - +#include <pthread.h> 27 - 28 - // for thread safe strings 29 - #include <string>
+4 -9
pkgs/top-level/all-packages.nix
··· 13769 13769 13770 13770 tewisay = callPackage ../tools/misc/tewisay { }; 13771 13771 13772 - texmacs = if stdenv.isDarwin 13773 - then callPackage ../applications/editors/texmacs/darwin.nix { 13774 - inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa; 13775 - tex = texlive.combined.scheme-small; 13776 - extraFonts = true; 13777 - } else libsForQt5.callPackage ../applications/editors/texmacs { 13778 - tex = texlive.combined.scheme-small; 13779 - extraFonts = true; 13780 - }; 13772 + texmacs = libsForQt5.callPackage ../applications/editors/texmacs { 13773 + tex = texlive.combined.scheme-small; 13774 + extraFonts = true; 13775 + }; 13781 13776 13782 13777 texmaker = libsForQt5.callPackage ../applications/editors/texmaker { }; 13783 13778