diff options
| author | Chris Rendle-Short <chris@killred.net> | 2019-08-10 22:10:44 +1000 |
|---|---|---|
| committer | Chris Rendle-Short <chris@killred.net> | 2019-08-11 09:36:51 +1000 |
| commit | e373ce139f35d82665133f39d2e447e6b584761f (patch) | |
| tree | a8e6fafa0542e450899474789a6f146f2041acd4 /pkgs/applications/editors | |
| parent | 5ce8864c54c7cdd4f57169ab3dc68b48ccb29f6a (diff) | |
sigil: use qt5's mkDerivation
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 #65399
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/sigil/default.nix | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix index 871ca1c671dc4..276946e6a2e5e 100644 --- a/pkgs/applications/editors/sigil/default.nix +++ b/pkgs/applications/editors/sigil/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, makeWrapper +{ stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, makeWrapper , boost, xercesc , qtbase, qttools, qtwebkit, qtxmlpatterns , python3, python3Packages }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "sigil-${version}"; version = "0.9.14"; @@ -17,17 +17,18 @@ stdenv.mkDerivation rec { pythonPath = with python3Packages; [ lxml ]; - propagatedBuildInputs = with python3Packages; [ lxml ]; - nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; buildInputs = [ boost xercesc qtbase qttools qtwebkit qtxmlpatterns - python3 python3Packages.lxml ]; + python3Packages.lxml ]; + + dontWrapQtApps = true; preFixup = '' wrapProgram "$out/bin/sigil" \ - --prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath ${python3Packages.lxml}) + --prefix PYTHONPATH : $PYTHONPATH \ + ''${qtWrapperArgs[@]} ''; enableParallelBuilding = true; @@ -36,7 +37,7 @@ stdenv.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; }; } |