Unverified Commit 9fc01a01 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #261441 from wegank/texmacs-bump 

texmacs: 2.1 -> 2.1.2
parents f701298d e414a727

pkgs/applications/editors/texmacs/default.nix

+31 −11
Original line number Diff line number Diff line 
{ lib, mkDerivation, callPackage, fetchurl,

  guile_1_8, qtbase, xmodmap, which, freetype,

{ lib, stdenv, callPackage, fetchurl,

  guile_1_8, xmodmap, which, freetype,

  libjpeg,

  sqlite,

  tex ? null,
@@ -8,6 +8,11 @@ 
  python3 ? null,

  cmake,

  pkg-config,

  wrapQtAppsHook,

  xdg-utils,

  qtbase,

  qtsvg,

  qtmacextras,

  ghostscriptX ? null,

  extraFonts ? false,

  chineseFonts ? false,
@@ -15,32 +20,49 @@ 
  koreanFonts ? false }:



let

  pname = "TeXmacs";

  version = "2.1";

  pname = "texmacs";

  version = "2.1.2";

  common = callPackage ./common.nix {

    inherit tex extraFonts chineseFonts japaneseFonts koreanFonts;

  };

in

mkDerivation {

stdenv.mkDerivation {

  inherit pname version;



  src = fetchurl {

    url = "https://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz";

    sha256 = "1gl6k1bwrk1y7hjyl4xvlqvmk5crl4jvsk8wrfp7ynbdin6n2i48";

    hash = "sha256-Ds9gxOwMYSttEWrawgxLHGxHyMBvt8WmyPIwBP2g/CM=";

  };



  nativeBuildInputs = [ cmake pkg-config ];

  postPatch = common.postPatch + ''

    substituteInPlace configure \

      --replace "-mfpmath=sse -msse2" ""

  '';



  nativeBuildInputs = [

    guile_1_8

    pkg-config

    wrapQtAppsHook

    xdg-utils

  ] ++ lib.optionals (!stdenv.isDarwin) [

    cmake

  ];



  buildInputs = [

    guile_1_8

    qtbase

    qtsvg

    ghostscriptX

    freetype

    libjpeg

    sqlite

    git

    python3

  ] ++ lib.optionals stdenv.isDarwin [

    qtmacextras

  ];

  NIX_LDFLAGS = "-lz";



  env.NIX_LDFLAGS = "-lz";



  qtWrapperArgs = [

    "--suffix" "PATH" ":" (lib.makeBinPath [
@@ -58,10 +80,8 @@ mkDerivation { 
    wrapQtApp $out/bin/texmacs

  '';



  inherit (common) postPatch;



  meta = common.meta // {

    maintainers = [ lib.maintainers.roconnor ];

    platforms = lib.platforms.gnu ++ lib.platforms.linux;  # arbitrary choice

    platforms = lib.platforms.all;

  };

}

pkgs/top-level/all-packages.nix

+1 −0
Original line number Diff line number Diff line
@@ -13836,6 +13836,7 @@ with pkgs; 
  tewisay = callPackage ../tools/misc/tewisay { };















  texmacs = libsForQt5.callPackage ../applications/editors/texmacs {













    stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;















    tex = texlive.combined.scheme-small;















    extraFonts = true;















  };