diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-06-17 12:19:05 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-06-17 15:59:40 +0200 |
| commit | 7f359a7a2766084b4463bdfe92cafb87e7ea348e (patch) | |
| tree | 1a7ba91f375bc674553757556f59303ea91a8a6d /pkgs/applications/misc | |
| parent | 3b0560dddc71323538b8cdedfe64925d3c51478c (diff) | |
| parent | e3ad1039c596e7e21856c6277e0fe6e35f3aca4f (diff) | |
| download | nixlib-7f359a7a2766084b4463bdfe92cafb87e7ea348e.tar nixlib-7f359a7a2766084b4463bdfe92cafb87e7ea348e.tar.gz nixlib-7f359a7a2766084b4463bdfe92cafb87e7ea348e.tar.bz2 nixlib-7f359a7a2766084b4463bdfe92cafb87e7ea348e.tar.lz nixlib-7f359a7a2766084b4463bdfe92cafb87e7ea348e.tar.xz nixlib-7f359a7a2766084b4463bdfe92cafb87e7ea348e.tar.zst nixlib-7f359a7a2766084b4463bdfe92cafb87e7ea348e.zip | |
Merge #42126: lyx: fix build with Qt5.11
Diffstat (limited to 'pkgs/applications/misc')
| -rw-r--r-- | pkgs/applications/misc/lyx/default.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index 092ad6bf4780..ad3bd499cde9 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, python, file, bc +{ fetchurl, stdenv, pkgconfig, python, file, bc, fetchpatch , qtbase, qtsvg, hunspell, makeWrapper #, mythes, boost }: @@ -35,6 +35,13 @@ stdenv.mkDerivation rec { --prefix PATH : '${python}/bin' ''; + patches = [ + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-office/lyx/files/lyx-2.3.0-qt-5.11.patch?id=07e82fd1fc07bf055c78b81eaa128f8f837da80d"; + sha256 = "1bnx0il2iv36lnrnyb370wyvww0rd8bphcy6z8d7zmvd3pwhyfql"; + }) + ]; + meta = with stdenv.lib; { description = "WYSIWYM frontend for LaTeX, DocBook"; homepage = http://www.lyx.org; |