New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
sigil: use qt5's mkDerivation #66435
Conversation
Can you apply this patch @lightbulbjim? This expression is kinda atypical. patchdiff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix
index 36e9bc757a4..d977599eca1 100644
--- a/pkgs/applications/editors/sigil/default.nix
+++ b/pkgs/applications/editors/sigil/default.nix
@@ -17,18 +17,18 @@ mkDerivation rec {
pythonPath = with python3Packages; [ lxml ];
- propagatedBuildInputs = with python3Packages; [ lxml ];
-
nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
buildInputs = [
boost xercesc qtbase qttools qtwebkit qtxmlpatterns
- python3 python3Packages.lxml ];
+ ];
+
+ dontWrapQtApps = true;
preFixup = ''
- wrapQtApp "$out/lib/sigil/sigil"
wrapProgram "$out/bin/sigil" \
- --prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath ${python3Packages.lxml})
+ --prefix PYTHONPATH : $PYTHONPATH \
+ ''${qtWrapperArgs[@]}
'';
enableParallelBuilding = true;
@@ -37,7 +37,7 @@ mkDerivation rec {
description = "Free, open source, multi-platform ebook (ePub) editor";
homepage = https://github.com/Sigil-Ebook/Sigil/;
license = licenses.gpl3;
- maintainers =[ maintainers.ramkromberg ];
+ maintainers = [ maintainers.ramkromberg ];
platforms = platforms.linux;
};
}
|
Can you also remove @RamKromberg from |
Slightly different implementation because out of the box: - $out/bin/sigil is a shell script wrapper - $out/lib/sigil/sigil is the ELF executable See NixOS#65399
5cf10fb
to
e373ce1
Compare
Maintainer has not committed for >2 years.
It works as long as I retain Would it be more idiomatic to use
Done. |
I don't think so, this would add python's |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Starts for me and I checked that the wrapper had the correct entries.
Motivation for this change
Slightly different implementation because out of the box:
$out/bin/sigil
is a shell script wrapper$out/lib/sigil/sigil
is the ELF executableSee #65399
Things done
sandbox
innix.conf
on non-NixOS)nix-shell -p nix-review --run "nix-review wip"
./result/bin/
)nix path-info -S
before and after)Notify maintainers
cc @RamKromberg