diff options
| author | Nick Cao <nickcao@nichi.co> | 2024-02-14 09:35:29 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-14 09:35:29 -0500 |
| commit | abb8edb791193ac2950d8a25415d0dd1eb537d1f (patch) | |
| tree | f3067b8ac5c7ff44648afb3a2d8cbcd922ddf656 /pkgs/applications/editors | |
| parent | a42f5c6d1af7c844959712a2b1096913c8141664 (diff) | |
| parent | 51d752cdafd825fd39d7b7fdbd346f9858ebf759 (diff) | |
| download | nixlib-abb8edb791193ac2950d8a25415d0dd1eb537d1f.tar nixlib-abb8edb791193ac2950d8a25415d0dd1eb537d1f.tar.gz nixlib-abb8edb791193ac2950d8a25415d0dd1eb537d1f.tar.bz2 nixlib-abb8edb791193ac2950d8a25415d0dd1eb537d1f.tar.lz nixlib-abb8edb791193ac2950d8a25415d0dd1eb537d1f.tar.xz nixlib-abb8edb791193ac2950d8a25415d0dd1eb537d1f.tar.zst nixlib-abb8edb791193ac2950d8a25415d0dd1eb537d1f.zip | |
Merge pull request #288649 from dotlambda/texworks-0.6.9
texworks: 0.6.8 -> 0.6.9
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/texworks/0001-fix-build-with-qt-6.5.patch | 26 | ||||
| -rw-r--r-- | pkgs/applications/editors/texworks/default.nix | 6 |
2 files changed, 2 insertions, 30 deletions
diff --git a/pkgs/applications/editors/texworks/0001-fix-build-with-qt-6.5.patch b/pkgs/applications/editors/texworks/0001-fix-build-with-qt-6.5.patch deleted file mode 100644 index 8cafd9c3e2e6..000000000000 --- a/pkgs/applications/editors/texworks/0001-fix-build-with-qt-6.5.patch +++ /dev/null @@ -1,26 +0,0 @@ -From b26a91fd0f70e8f0a8f3360a5f371a1eace70002 Mon Sep 17 00:00:00 2001 -From: Nick Cao <nickcao@nichi.co> -Date: Sun, 16 Apr 2023 22:10:55 +0800 -Subject: [PATCH] fix build with qt 6.5 - -The fix is borrowed from https://github.com/hluk/CopyQ/pull/2324 ---- - src/scripting/Script.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/scripting/Script.cpp b/src/scripting/Script.cpp -index 3437f125..906eefde 100644 ---- a/src/scripting/Script.cpp -+++ b/src/scripting/Script.cpp -@@ -352,7 +352,7 @@ Script::MethodResult Script::doCallMethod(QObject * obj, const QString& name, - } - else if (typeName == QString::fromLatin1("QVariant")) { - // QMetaType can't construct QVariant objects -- retValArg = Q_RETURN_ARG(QVariant, result); -+ retValArg = QGenericReturnArgument("QVariant", static_cast<void*>(result.data())); - } - else { - // Note: These two lines are a hack! --- -2.39.2 - diff --git a/pkgs/applications/editors/texworks/default.nix b/pkgs/applications/editors/texworks/default.nix index 315db4115900..4ddd4c9cb6c1 100644 --- a/pkgs/applications/editors/texworks/default.nix +++ b/pkgs/applications/editors/texworks/default.nix @@ -14,17 +14,15 @@ stdenv.mkDerivation rec { pname = "texworks"; - version = "0.6.8"; + version = "0.6.9"; src = fetchFromGitHub { owner = "TeXworks"; repo = "texworks"; rev = "release-${version}"; - sha256 = "sha256-X0VuXNghHoNsNNDfZJXXJ++nfUa5ofjW8rv3CHOUzxQ="; + sha256 = "sha256-G8TVTVQPELyE6H9a6gWSyWHi653TWzUoaRdlfPnngM0="; }; - patches = [ ./0001-fix-build-with-qt-6.5.patch ]; - nativeBuildInputs = [ cmake pkg-config |