alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #8987 from Profpatsch/texmacs-update

Browse source 
texmacs: update to 1.99.2
This commit is contained in:
Arseniy Seroka 2015-07-29 00:27:12 +03:00
parent c71d93c519 f3c1ad6baf
commit 0117488423
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/applications/editors/texmacs/default.nix
View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, guile, libX11, libXext, xmodmap, which, makeWrapper, freetype,
{stdenv, fetchurl, guile_1_8, qt4, zlib, xmodmap, which, makeWrapper, freetype,
tex ? null,
aspell ? null,
ghostscriptX ? null,
@ -9,7 +9,7 @@
let
pname = "TeXmacs";
version = "1.0.7.11";
version = "1.99.2";
extraFontsSrc = fetchurl {
url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-extra-fonts-1.0-noarch.tar.gz";
sha256 = "0hylgjmd95y9yahbblmawkkw0i71vb145xxv2xqrmff81301n6k7";
@ -39,11 +39,11 @@ stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "ftp://ftp.texmacs.org/pub/${pname}/targz/${name}-src.tar.gz";
sha256 = "0x1r9417dzbrxf785faq1vjszqdj94ig2lzwm8sd92bxcxr6knfa";
url = "http://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz";
sha256 = "0l48g9746igiaxw657shm8g3xxk565vzsviajlrxqyljbh6py0fs";
};
buildInputs = [ guile libX11 libXext makeWrapper ghostscriptX freetype ];
buildInputs = [ guile_1_8 qt4 makeWrapper ghostscriptX freetype ];
patchPhase = (if tex == null then ''
gunzip < ${fullFontsSrc} | (cd TeXmacs && tar xvf -)
@ -66,6 +66,12 @@ stdenv.mkDerivation rec {
(if tex == null then "" else "${tex}/bin:") +
"${xmodmap}/bin:${which}/bin";
postFixup = ''
bin="$out/libexec/TeXmacs/bin/texmacs.bin"
rpath=$(patchelf --print-rpath "$bin")
patchelf --set-rpath "$rpath:${zlib}/lib" "$bin"
'';
meta = {
description = "WYSIWYW editing platform with special features for scientists";
longDescription =

1
pkgs/top-level/all-packages.nix
View file

@ -3117,7 +3117,6 @@ let
texmacs = callPackage ../applications/editors/texmacs {
tex = texLive; /* tetex is also an option */
extraFonts = true;
guile = guile_1_8;
};
texmaker = callPackage ../applications/editors/texmaker { };