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

texworks: use Qt 5.15

This commit is contained in:
Robert Schütz 2021-02-03 14:36:44 +01:00
parent e44011c1a6
commit b2e5c48ab3
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/editors/texworks/default.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation, lib, fetchFromGitHub, cmake, pkg-config { mkDerivation, lib, fetchFromGitHub, fetchpatch, cmake, pkg-config
, qtscript, poppler, hunspell , qtscript, poppler, hunspell
, withLua ? true, lua , withLua ? true, lua
, withPython ? true, python3 }: , withPython ? true, python3 }:
@ -14,6 +14,14 @@ mkDerivation rec {
sha256 = "1lw1p4iyzxypvjhnav11g6rwf6gx7kyzwy2iprvv8zzpqcdkjp2z"; sha256 = "1lw1p4iyzxypvjhnav11g6rwf6gx7kyzwy2iprvv8zzpqcdkjp2z";
}; };
patches = [
(fetchpatch {
name = "fix-compilation-with-qt-5.15.patch";
url = "https://github.com/TeXworks/texworks/commit/a5352a3a94e3685125650b65e6197de060326cc2.patch";
sha256 = "0pf7h1m11x0s039bxknm7rxdp9b4g8ch86y38jlyy56c74mw97i6";
})
];
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ qtscript poppler hunspell ] buildInputs = [ qtscript poppler hunspell ]
++ lib.optional withLua lua ++ lib.optional withLua lua

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

@ -8253,7 +8253,7 @@ in
textadept11 = callPackage ../applications/editors/textadept/11 { }; textadept11 = callPackage ../applications/editors/textadept/11 { };
texworks = libsForQt514.callPackage ../applications/editors/texworks { }; texworks = libsForQt5.callPackage ../applications/editors/texworks { };
thc-hydra = callPackage ../tools/security/thc-hydra { }; thc-hydra = callPackage ../tools/security/thc-hydra { };