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

lyx: 2.1.5 -> 2.2.2

Browse Source 
... and use Qt5 now!
This commit is contained in:
Vladimír Čunát 2016-12-04 21:11:28 +01:00
parent ae0bfae810
commit 0fd5a0c8a3
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/applications/misc/lyx/default.nix
View File

@ -1,29 +1,35 @@
{ fetchurl, stdenv, pkgconfig, python, file, bc { fetchurl, stdenv, pkgconfig, python, file, bc
, qt4, hunspell, makeWrapper #, mythes, boost , qtbase, qtsvg, hunspell, makeWrapper #, mythes, boost
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.1.5"; version = "2.2.2";
name = "lyx-${version}"; name = "lyx-${version}";
src = fetchurl { src = fetchurl {
url = "ftp://ftp.lyx.org/pub/lyx/stable/2.1.x/${name}.tar.xz"; url = "ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/${name}.tar.xz";
sha256 = "1wrcxsvr5kx8cfdabshzmcjrb3rmy5bh74njnzpq9m5xms8parrf"; sha256 = "0s2mma8fkj5mi8qzc0j67589mbj854bypx2s3y59y1n429s3sp58";
}; };
# LaTeX is used from $PATH, as people often want to have it with extra pkgs
buildInputs = [
pkgconfig qtbase qtsvg python file/*for libmagic*/ bc
hunspell makeWrapper # enchant
];
# bogus configure script tests
preConfigure = ''
NIX_CFLAGS_COMPILE+=" $(pkg-config --cflags Qt5Core)"
'';
configureFlags = [ configureFlags = [
"--enable-qt5"
#"--without-included-boost" #"--without-included-boost"
/* Boost is a huge dependency from which 1.4 MB of libs would be used. /* Boost is a huge dependency from which 1.4 MB of libs would be used.
Using internal boost stuff only increases executable by around 0.2 MB. */ Using internal boost stuff only increases executable by around 0.2 MB. */
#"--without-included-mythes" # such a small library isn't worth a separate package #"--without-included-mythes" # such a small library isn't worth a separate package
]; ];
# LaTeX is used from $PATH, as people often want to have it with extra pkgs
buildInputs = [
pkgconfig qt4 python file/*for libmagic*/ bc
hunspell makeWrapper # enchant
];
enableParallelBuilding = true; enableParallelBuilding = true;
doCheck = true; doCheck = true;

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

@ -13743,7 +13743,7 @@ in
lynx = callPackage ../applications/networking/browsers/lynx { }; lynx = callPackage ../applications/networking/browsers/lynx { };
lyx = callPackage ../applications/misc/lyx { }; lyx = qt5.callPackage ../applications/misc/lyx { };
magnetophonDSP = { magnetophonDSP = {
CharacterCompressor = callPackage ../applications/audio/magnetophonDSP/CharacterCompressor { }; CharacterCompressor = callPackage ../applications/audio/magnetophonDSP/CharacterCompressor { };