colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

texmacs: 1.99.11 -> 1.99.13

Browse Source
This commit is contained in:
Florian Franzen 2020-04-09 16:05:11 +02:00
parent 0b5d5d6828
commit a30600a387
2 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
pkgs/applications/editors/texmacs/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, callPackage, { lib, mkDerivation, callPackage, fetchurl, fetchpatch,
fetchurl, guile_1_8, qt4, xmodmap, which, makeWrapper, freetype, guile_1_8, qtbase, xmodmap, which, freetype,
libjpeg, libjpeg,
sqlite, sqlite,
tex ? null, tex ? null,
@ -16,23 +16,30 @@
let let
pname = "TeXmacs"; pname = "TeXmacs";
version = "1.99.11"; version = "1.99.13";
common = callPackage ./common.nix { common = callPackage ./common.nix {
inherit tex extraFonts chineseFonts japaneseFonts koreanFonts; inherit tex extraFonts chineseFonts japaneseFonts koreanFonts;
}; };
in in
stdenv.mkDerivation { mkDerivation {
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "https://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz"; url = "https://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz";
sha256 = "12bp0f34izzqimz49lfpgf4lyz3h45s9xbmk8v6zsawdjki76alg"; sha256 = "Aq0cS47QqmFQHelxRjANeJlgXCXagnYRykpAq7wHqbQ=";
}; };
cmakeFlags = [ patches = [
# Texmacs' cmake build as of writing defaults to Qt5, # Minor patch for Qt 5.15 support, should be included in next release.
# but we haven't updated to that yet. (fetchpatch {
"-DTEXMACS_GUI=Qt4" url = "https://github.com/texmacs/texmacs/commit/3cf56af92326b74538f5e943928199ba6e963d0b.patch";
sha256 = "+OBQmnKgvQZZkLx6ea773Dwq0o7L92Sex/kcVUhmg6Q=";
})
# Fix returned version, lets hope they remember to bump the version next release.
(fetchpatch {
url = "https://github.com/texmacs/texmacs/commit/da5b67005d2fc31bb32ea1ead882c26af12d8cbb.patch";
sha256 = "czMgdraQErrdvN83jY76P673L52BpQkDwntmKvF0Ykg=";
})
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;
@ -40,8 +47,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ buildInputs = [
guile_1_8 guile_1_8
qt4 qtbase
makeWrapper
ghostscriptX ghostscriptX
freetype freetype
libjpeg libjpeg
@ -51,18 +57,26 @@ stdenv.mkDerivation {
]; ];
NIX_LDFLAGS = "-lz"; NIX_LDFLAGS = "-lz";
postInstall = "wrapProgram $out/bin/texmacs --suffix PATH : " + qtWrapperArgs = [
(if ghostscriptX == null then "" else "${ghostscriptX}/bin:") + "--suffix" "PATH" ":" (lib.makeBinPath [
(if aspell == null then "" else "${aspell}/bin:") + xmodmap
(if tex == null then "" else "${tex}/bin:") + which
(if git == null then "" else "${git}/bin:") + ghostscriptX
(if python3 == null then "" else "${python3}/bin:") + aspell
"${xmodmap}/bin:${which}/bin"; tex
git
python3
])
];
postFixup = ''
wrapQtApp $out/bin/texmacs
'';
inherit (common) postPatch; inherit (common) postPatch;
meta = common.meta // { meta = common.meta // {
maintainers = [ stdenv.lib.maintainers.roconnor ]; maintainers = [ lib.maintainers.roconnor ];
platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice
}; };
} }

2
pkgs/top-level/all-packages.nix
View File

@ -7354,7 +7354,7 @@ in
inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa; inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa;
tex = texlive.combined.scheme-small; tex = texlive.combined.scheme-small;
extraFonts = true; extraFonts = true;
} else callPackage ../applications/editors/texmacs { } else libsForQt5.callPackage ../applications/editors/texmacs {
tex = texlive.combined.scheme-small; tex = texlive.combined.scheme-small;
extraFonts = true; extraFonts = true;
}; };