summary refs log tree commit diff
diff options
context:
space:
mode:
authorajs124 <git@ajs124.de>2022-05-26 02:04:10 +0200
committerajs124 <git@ajs124.de>2023-09-04 13:54:49 +0200
commit173409fbc9fc264d6f923798d99255e901e5c710 (patch)
tree5eab4c6b2bb4feb9a6656e8561d313f040194150
parent85d2adb0cda26fb677f20573d56355b3b6aa7c04 (diff)
downloadnixpkgs-173409fbc9fc264d6f923798d99255e901e5c710.tar
nixpkgs-173409fbc9fc264d6f923798d99255e901e5c710.tar.gz
nixpkgs-173409fbc9fc264d6f923798d99255e901e5c710.tar.bz2
nixpkgs-173409fbc9fc264d6f923798d99255e901e5c710.tar.lz
nixpkgs-173409fbc9fc264d6f923798d99255e901e5c710.tar.xz
nixpkgs-173409fbc9fc264d6f923798d99255e901e5c710.tar.zst
nixpkgs-173409fbc9fc264d6f923798d99255e901e5c710.zip
texmacs: remove darwin version, because it depends on qt4
and hasn't been updated since it was added to nixpkgs
-rw-r--r--pkgs/applications/editors/texmacs/darwin.nix60
-rw-r--r--pkgs/applications/editors/texmacs/darwin.patch29
-rw-r--r--pkgs/top-level/all-packages.nix13
3 files changed, 4 insertions, 98 deletions
diff --git a/pkgs/applications/editors/texmacs/darwin.nix b/pkgs/applications/editors/texmacs/darwin.nix
deleted file mode 100644
index 8c74d8c5c8f..00000000000
--- a/pkgs/applications/editors/texmacs/darwin.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{ lib, stdenv, callPackage, fetchurl,
-  guile_1_8, qt4, zlib, freetype, CoreFoundation, Cocoa, gettext, libiconv, ghostscript,
-  tex ? null,
-  aspell ? null,
-  netpbm ? null,
-  imagemagick ? null,
-  extraFonts ? false,
-  chineseFonts ? false,
-  japaneseFonts ? false,
-  koreanFonts ? false }:
-let
-  version = "1.99.4";
-  common = callPackage ./common.nix {
-    inherit tex extraFonts chineseFonts japaneseFonts koreanFonts;
-  };
-in
-stdenv.mkDerivation {
-  pname = "TeXmacs";
-  inherit version;
-
-  src= fetchurl {
-    url = "http://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz";
-    sha256 = "1z8sj0xd1ncbl7ipzfsib6lmc7ahgvmiw61ln5zxm2l88jf7qc1a";
-  };
-
-  patches = [ ./darwin.patch ];
-
-  buildInputs = [ guile_1_8.dev qt4 freetype CoreFoundation Cocoa gettext libiconv ghostscript ];
-
-  GUILE_CPPFLAGS="-D_THREAD_SAFE -I${guile_1_8.dev}/include -I${guile_1_8.dev}/include/guile ";
-
-  NIX_LDFLAGS="${zlib}/lib/libz.dylib";
-
-  buildPhase = ''
-    substituteInPlace Makefile \
-      --replace 'find -d $(MACOS_PACKAGE_TEXMACS)' 'find $(MACOS_PACKAGE_TEXMACS) -depth' \
-      --replace '$(MACOS_PACKAGE_SRC)/bundle-libs.sh' 'true'
-    make MACOS_BUNDLE
-  '';
-
-  installPhase = ''
-    mkdir -p $out/Applications
-    cp -R ../distr/TeXmacs-${version}.app $out/Applications
-  '';
-
-  inherit (common) postPatch;
-
-  postInstall = "wrapProgram $out/Applications/TeXmacs-${version}/Contents/MacOS/TeXmacs --suffix PATH : " +
-    "${ghostscript}/bin:" +
-    (lib.optionalString (aspell != null) "${aspell}/bin:") +
-    (lib.optionalString (tex != null) "${tex}/bin:") +
-    (lib.optionalString (netpbm != null) "${lib.getBin netpbm}/bin:") +
-    (lib.optionalString (imagemagick != null) "${imagemagick}/bin:");
-
-  enableParallelBuilding = true;
-
-  meta = common.meta // {
-    platforms = lib.platforms.darwin;
-  };
-}
diff --git a/pkgs/applications/editors/texmacs/darwin.patch b/pkgs/applications/editors/texmacs/darwin.patch
deleted file mode 100644
index 2cb33fbbef3..00000000000
--- a/pkgs/applications/editors/texmacs/darwin.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -7461,7 +7461,7 @@ $as_echo "final adjustments for cygwin host" >&6; }
-     CONFIG_QTPIPES="yes"
-     CONFIG_CXXFLAGS="-I${prefix}/include"
-     CONFIG_BSHARED=""
--    CONFIG_BFLAGS="-framework Cocoa -framework IOKit"
-+    CONFIG_BFLAGS="-framework Cocoa -framework IOKit -framework CoreFoundation"
-     CONFIG_BPATH=""
-     CONFIG_SO="dylib"
-     CONFIG_LIB_PATH="DYLD_LIBRARY_PATH"
-@@ -8281,6 +8281,7 @@ _ASEOF
-   if $QMAKE ${additional_qmake_flags} ; then :; else
-     as_fn_error $? "Calling $QMAKE failed." "$LINENO" 5
-   fi
-+  echo "QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.10" >> $pro_file
-   # Try to compile a simple Qt app.
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can build a simple Qt app" >&5
- $as_echo_n "checking whether we can build a simple Qt app... " >&6; }
---- a/src/Plugins/Unix/unix_sys_utils.cpp
-+++ b/src/Plugins/Unix/unix_sys_utils.cpp
-@@ -17,6 +17,7 @@
- #include <spawn.h>
- #include <unistd.h>
- #include <sys/wait.h>
-+#include <pthread.h>
- 
- // for thread safe strings
- #include <string>
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6fb91589657..6ef4e31f982 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13769,15 +13769,10 @@ with pkgs;
 
   tewisay = callPackage ../tools/misc/tewisay { };
 
-  texmacs = if stdenv.isDarwin
-    then callPackage ../applications/editors/texmacs/darwin.nix {
-      inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa;
-      tex = texlive.combined.scheme-small;
-      extraFonts = true;
-    } else libsForQt5.callPackage ../applications/editors/texmacs {
-      tex = texlive.combined.scheme-small;
-      extraFonts = true;
-    };
+  texmacs = libsForQt5.callPackage ../applications/editors/texmacs {
+    tex = texlive.combined.scheme-small;
+    extraFonts = true;
+  };
 
   texmaker = libsForQt5.callPackage ../applications/editors/texmaker { };