public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #66435 from lightbulbjim/sigil-wrapping

Browse Source 
sigil: use qt5's mkDerivation
This commit is contained in:
worldofpeace 2019-08-11 22:17:02 -04:00 committed by GitHub
commit d73cca7808
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/applications/editors/sigil/default.nix
View File

@ -1,10 +1,10 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, makeWrapper { stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, makeWrapper
, boost, xercesc , boost, xercesc
, qtbase, qttools, qtwebkit, qtxmlpatterns , qtbase, qttools, qtwebkit, qtxmlpatterns
, python3, python3Packages , python3, python3Packages
}: }:
stdenv.mkDerivation rec { mkDerivation rec {
name = "sigil-${version}"; name = "sigil-${version}";
version = "0.9.14"; version = "0.9.14";
@ -17,17 +17,18 @@ stdenv.mkDerivation rec {
pythonPath = with python3Packages; [ lxml ]; pythonPath = with python3Packages; [ lxml ];
propagatedBuildInputs = with python3Packages; [ lxml ];
nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
buildInputs = [ buildInputs = [
boost xercesc qtbase qttools qtwebkit qtxmlpatterns boost xercesc qtbase qttools qtwebkit qtxmlpatterns
python3 python3Packages.lxml ]; python3Packages.lxml ];
dontWrapQtApps = true;
preFixup = '' preFixup = ''
wrapProgram "$out/bin/sigil" \ wrapProgram "$out/bin/sigil" \
--prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath ${python3Packages.lxml}) --prefix PYTHONPATH : $PYTHONPATH \
''${qtWrapperArgs[@]}
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;
@ -36,7 +37,7 @@ stdenv.mkDerivation rec {
description = "Free, open source, multi-platform ebook (ePub) editor"; description = "Free, open source, multi-platform ebook (ePub) editor";
homepage = https://github.com/Sigil-Ebook/Sigil/; homepage = https://github.com/Sigil-Ebook/Sigil/;
license = licenses.gpl3; license = licenses.gpl3;
maintainers =[ maintainers.ramkromberg ]; # currently unmaintained
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }