Merge pull request #114834 from sternenseemann/apostrophe-2.3
This commit is contained in:
commit
673bb14266
|
@ -2,37 +2,37 @@
|
|||
, wrapGAppsHook, pkg-config, desktop-file-utils
|
||||
, appstream-glib, pythonPackages, glib, gobject-introspection
|
||||
, gtk3, webkitgtk, glib-networking, gnome3, gspell, texlive
|
||||
, shared-mime-info, haskellPackages}:
|
||||
, shared-mime-info, haskellPackages, libhandy
|
||||
}:
|
||||
|
||||
let
|
||||
pythonEnv = pythonPackages.python.withPackages(p: with p;
|
||||
[ regex setuptools python-Levenshtein pyenchant pygobject3 pycairo pypandoc ]);
|
||||
texliveDist = texlive.combined.scheme-medium;
|
||||
pythonEnv = pythonPackages.python.withPackages(p: with p; [
|
||||
regex setuptools python-Levenshtein pyenchant
|
||||
pygobject3 pycairo pypandoc chardet
|
||||
]);
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "apostrophe";
|
||||
version = "2.2.0.3";
|
||||
version = "2.3";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "somas";
|
||||
repo = pname;
|
||||
domain = "gitlab.gnome.org";
|
||||
rev = "v${version}";
|
||||
sha256 = "06bl1hc69ixk2vcb2ig74mwid14sl5zq6rfna7lx9na6j3l04879";
|
||||
sha256 = "1ggrbbnhbnf6p3hs72dww3c9m1rvr4znggmvwcpj6i8v1a3kycnb";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja cmake pkg-config desktop-file-utils
|
||||
appstream-glib wrapGAppsHook ];
|
||||
|
||||
buildInputs = [ glib pythonEnv gobject-introspection gtk3
|
||||
gnome3.adwaita-icon-theme webkitgtk gspell texliveDist
|
||||
glib-networking ];
|
||||
gnome3.adwaita-icon-theme webkitgtk gspell texlive
|
||||
glib-networking libhandy ];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs --build build-aux/meson_post_install.py
|
||||
|
||||
substituteInPlace ${pname}/config.py --replace "/usr/share/${pname}" "$out/share/${pname}"
|
||||
|
||||
# get rid of unused distributed dependencies
|
||||
rm -r ${pname}/pylocales
|
||||
'';
|
||||
|
@ -40,7 +40,7 @@ in stdenv.mkDerivation rec {
|
|||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
--prefix PYTHONPATH : "$out/lib/python${pythonEnv.pythonVersion}/site-packages/"
|
||||
--prefix PATH : "${texliveDist}/bin"
|
||||
--prefix PATH : "${texlive}/bin"
|
||||
--prefix PATH : "${haskellPackages.pandoc-citeproc}/bin"
|
||||
--prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
|
||||
)
|
||||
|
|
|
@ -21306,6 +21306,7 @@ in
|
|||
|
||||
apostrophe = callPackage ../applications/editors/apostrophe {
|
||||
pythonPackages = python3Packages;
|
||||
texlive = texlive.combined.scheme-medium;
|
||||
};
|
||||
|
||||
aqemu = libsForQt5.callPackage ../applications/virtualization/aqemu { };
|
||||
|
|
Loading…
Reference in a new issue