cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #111757 from dotlambda/texworks-qt515

Browse source 
texworks: use Qt 5.15
This commit is contained in:
Sandro 2021-02-03 21:30:10 +01:00 committed by GitHub
commit c31388b6aa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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
, withLua ? true, lua
, withPython ? true, python3 }:
@ -14,6 +14,14 @@ mkDerivation rec {
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 ];
buildInputs = [ qtscript poppler hunspell ]
++ lib.optional withLua lua

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

@ -8261,7 +8261,7 @@ in
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 { };