Merge pull request #328949 from hzeller/feature-20240721-update-lyx

lyx: 2.3.7-1 -> 2.4.1
This commit is contained in:
Peder Bergebakken Sundt 2024-07-28 23:31:38 +02:00 committed by GitHub
commit 40d965fe4b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -1,34 +1,48 @@
{ fetchurl, lib, mkDerivation, pkg-config, python3, file, bc
, qtbase, qtsvg, hunspell, makeWrapper #, mythes, boost
{
fetchurl,
lib,
mkDerivation,
pkg-config,
python3,
file,
bc,
qtbase,
qtsvg,
hunspell,
makeWrapper, # , mythes, boost
}:
mkDerivation rec {
version = "2.3.7-1";
version = "2.4.1";
pname = "lyx";
src = fetchurl {
url = "ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${pname}-${version}.tar.xz";
sha256 = "sha256-Ob6IZPuGs06IMQ5w+4Dl6eKWYB8IVs8WGqCUFxcY2O0=";
url = "ftp://ftp.lyx.org/pub/lyx/stable/2.4.x/${pname}-${version}.tar.xz";
hash = "sha256-dN4ooH7zeqlHG8mWLbGCFSolMQx9H0f2drubxj2XE8U=";
};
# Needed with GCC 12
postPatch = ''
sed '1i#include <iterator>' -i src/lyxfind.cpp
sed '1i#include <cstring>' -i src/insets/InsetListings.cpp
'';
# LaTeX is used from $PATH, as people often want to have it with extra pkgs
nativeBuildInputs = [ pkg-config makeWrapper python3 qtbase ];
nativeBuildInputs = [
pkg-config
makeWrapper
python3
qtbase
];
buildInputs = [
qtbase qtsvg file/*for libmagic*/ bc
qtbase
qtsvg
file # for libmagic
bc
hunspell # enchant
];
configureFlags = [
"--enable-qt5"
#"--without-included-boost"
/* 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. */
/*
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.
*/
#"--without-included-mythes" # such a small library isn't worth a separate package
];
@ -36,9 +50,7 @@ mkDerivation rec {
doCheck = true;
# python is run during runtime to do various tasks
qtWrapperArgs = [
" --prefix PATH : ${python3}/bin"
];
qtWrapperArgs = [ " --prefix PATH : ${python3}/bin" ];
meta = with lib; {
description = "WYSIWYM frontend for LaTeX, DocBook";
@ -48,4 +60,3 @@ mkDerivation rec {
platforms = platforms.linux;
};
}