From bb18d1dcf1a7df66d69b38da5448fdebeec5e02c Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sat, 7 Nov 2020 12:50:11 +0100 Subject: [PATCH] sigil: migrate to Qt5.15 and fix segfault --- pkgs/applications/editors/sigil/default.nix | 4 ++++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix index 869c20c1d6c..eb026f6dca3 100644 --- a/pkgs/applications/editors/sigil/default.nix +++ b/pkgs/applications/editors/sigil/default.nix @@ -24,6 +24,10 @@ mkDerivation rec { python3Packages.lxml ]; + prePatch = '' + sed -i '/^QTLIB_DIR=/ d' src/Resource_Files/bash/sigil-sh_install + ''; + dontWrapQtApps = true; preFixup = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 76e258fbf8b..53129559d07 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7159,7 +7159,7 @@ in sigal = callPackage ../applications/misc/sigal { }; - sigil = libsForQt514.callPackage ../applications/editors/sigil { }; + sigil = libsForQt5.callPackage ../applications/editors/sigil { }; signal-cli = callPackage ../applications/networking/instant-messengers/signal-cli { };