pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #261441 from wegank/texmacs-bump

texmacs: 2.1 -> 2.1.2

authored by Weijia Wang and committed by GitHub 9fc01a01 f701298d

+32 -11
unified split
+31 -11
pkgs/applications/editors/texmacs/default.nix
··· 1 - { lib, mkDerivation, callPackage, fetchurl, 2 - guile_1_8, qtbase, xmodmap, which, freetype, 3 libjpeg, 4 sqlite, 5 tex ? null, ··· 8 python3 ? null, 9 cmake, 10 pkg-config, 11 ghostscriptX ? null, 12 extraFonts ? false, 13 chineseFonts ? false, ··· 15 koreanFonts ? false }: 16 17 let 18 - pname = "TeXmacs"; 19 - version = "2.1"; 20 common = callPackage ./common.nix { 21 inherit tex extraFonts chineseFonts japaneseFonts koreanFonts; 22 }; 23 in 24 - mkDerivation { 25 inherit pname version; 26 27 src = fetchurl { 28 url = "https://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz"; 29 - sha256 = "1gl6k1bwrk1y7hjyl4xvlqvmk5crl4jvsk8wrfp7ynbdin6n2i48"; 30 }; 31 32 - nativeBuildInputs = [ cmake pkg-config ]; 33 buildInputs = [ 34 guile_1_8 35 qtbase 36 ghostscriptX 37 freetype 38 libjpeg 39 sqlite 40 git 41 python3 42 ]; 43 - NIX_LDFLAGS = "-lz"; 44 45 qtWrapperArgs = [ 46 "--suffix" "PATH" ":" (lib.makeBinPath [ ··· 58 wrapQtApp $out/bin/texmacs 59 ''; 60 61 - inherit (common) postPatch; 62 - 63 meta = common.meta // { 64 maintainers = [ lib.maintainers.roconnor ]; 65 - platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice 66 }; 67 }
··· 1 + { lib, stdenv, callPackage, fetchurl, 2 + guile_1_8, xmodmap, which, freetype, 3 libjpeg, 4 sqlite, 5 tex ? null, ··· 8 python3 ? null, 9 cmake, 10 pkg-config, 11 + wrapQtAppsHook, 12 + xdg-utils, 13 + qtbase, 14 + qtsvg, 15 + qtmacextras, 16 ghostscriptX ? null, 17 extraFonts ? false, 18 chineseFonts ? false, ··· 20 koreanFonts ? false }: 21 22 let 23 + pname = "texmacs"; 24 + version = "2.1.2"; 25 common = callPackage ./common.nix { 26 inherit tex extraFonts chineseFonts japaneseFonts koreanFonts; 27 }; 28 in 29 + stdenv.mkDerivation { 30 inherit pname version; 31 32 src = fetchurl { 33 url = "https://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz"; 34 + hash = "sha256-Ds9gxOwMYSttEWrawgxLHGxHyMBvt8WmyPIwBP2g/CM="; 35 }; 36 37 + postPatch = common.postPatch + '' 38 + substituteInPlace configure \ 39 + --replace "-mfpmath=sse -msse2" "" 40 + ''; 41 + 42 + nativeBuildInputs = [ 43 + guile_1_8 44 + pkg-config 45 + wrapQtAppsHook 46 + xdg-utils 47 + ] ++ lib.optionals (!stdenv.isDarwin) [ 48 + cmake 49 + ]; 50 + 51 buildInputs = [ 52 guile_1_8 53 qtbase 54 + qtsvg 55 ghostscriptX 56 freetype 57 libjpeg 58 sqlite 59 git 60 python3 61 + ] ++ lib.optionals stdenv.isDarwin [ 62 + qtmacextras 63 ]; 64 + 65 + env.NIX_LDFLAGS = "-lz"; 66 67 qtWrapperArgs = [ 68 "--suffix" "PATH" ":" (lib.makeBinPath [ ··· 80 wrapQtApp $out/bin/texmacs 81 ''; 82 83 meta = common.meta // { 84 maintainers = [ lib.maintainers.roconnor ]; 85 + platforms = lib.platforms.all; 86 }; 87 }
+1
pkgs/top-level/all-packages.nix
··· 13836 tewisay = callPackage ../tools/misc/tewisay { }; 13837 13838 texmacs = libsForQt5.callPackage ../applications/editors/texmacs { 13839 tex = texlive.combined.scheme-small; 13840 extraFonts = true; 13841 };
··· 13836 tewisay = callPackage ../tools/misc/tewisay { }; 13837 13838 texmacs = libsForQt5.callPackage ../applications/editors/texmacs { 13839 + stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; 13840 tex = texlive.combined.scheme-small; 13841 extraFonts = true; 13842 };