diff options
author | Niklas Hambüchen <mail@nh2.me> | 2019-10-30 15:04:04 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-30 15:04:04 +0100 |
commit | df3b011c42b820ae6aae6c7f568dab32e654daa2 (patch) | |
tree | f1f1e8257b3f1a0008393b3ac08f786507fb5e12 /pkgs/applications/editors/texmacs | |
parent | bae09a1c394fc5ea777171af6f439f8039d2d5c2 (diff) | |
parent | b69542ae15a05390258bb7267a842a33fe9577db (diff) | |
download | nixpkgs-df3b011c42b820ae6aae6c7f568dab32e654daa2.tar nixpkgs-df3b011c42b820ae6aae6c7f568dab32e654daa2.tar.gz nixpkgs-df3b011c42b820ae6aae6c7f568dab32e654daa2.tar.bz2 nixpkgs-df3b011c42b820ae6aae6c7f568dab32e654daa2.tar.lz nixpkgs-df3b011c42b820ae6aae6c7f568dab32e654daa2.tar.xz nixpkgs-df3b011c42b820ae6aae6c7f568dab32e654daa2.tar.zst nixpkgs-df3b011c42b820ae6aae6c7f568dab32e654daa2.zip |
Merge pull request #63938 from nh2/texmacs-1.99.10
texmacs: 1.99.2 -> 1.99.10
Diffstat (limited to 'pkgs/applications/editors/texmacs')
-rw-r--r-- | pkgs/applications/editors/texmacs/default.nix | 35 |
1 files changed, 31 insertions, 4 deletions
diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix index 2c391cae517..31160c0916c 100644 --- a/pkgs/applications/editors/texmacs/default.nix +++ b/pkgs/applications/editors/texmacs/default.nix @@ -1,7 +1,13 @@ { stdenv, callPackage, fetchurl, guile_1_8, qt4, xmodmap, which, makeWrapper, freetype, + libjpeg, + sqlite, tex ? null, aspell ? null, + git ? null, + python3 ? null, + cmake, + pkgconfig, ghostscriptX ? null, extraFonts ? false, chineseFonts ? false, @@ -10,7 +16,7 @@ let pname = "TeXmacs"; - version = "1.99.2"; + version = "1.99.10"; common = callPackage ./common.nix { inherit tex extraFonts chineseFonts japaneseFonts koreanFonts; }; @@ -19,17 +25,38 @@ stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { - url = "http://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz"; - sha256 = "0l48g9746igiaxw657shm8g3xxk565vzsviajlrxqyljbh6py0fs"; + url = "https://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz"; + sha256 = "1k12bkcik7mv93q0j7q3b77x8s6rmvlb23s3v7nnzdwjxlp5lph2"; }; - buildInputs = [ guile_1_8 qt4 makeWrapper ghostscriptX freetype ]; + cmakeFlags = [ + # Texmacs' cmake build as of writing defaults to Qt5, + # but we haven't updated to that yet. + "-DTEXMACS_GUI=Qt4" + ]; + + enableParallelBuilding = true; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ + guile_1_8 + qt4 + makeWrapper + ghostscriptX + freetype + libjpeg + sqlite + git + python3 + ]; NIX_LDFLAGS = [ "-lz" ]; postInstall = "wrapProgram $out/bin/texmacs --suffix PATH : " + (if ghostscriptX == null then "" else "${ghostscriptX}/bin:") + (if aspell == null then "" else "${aspell}/bin:") + (if tex == null then "" else "${tex}/bin:") + + (if git == null then "" else "${git}/bin:") + + (if python3 == null then "" else "${python3}/bin:") + "${xmodmap}/bin:${which}/bin"; inherit (common) postPatch; |