zim: 0.74.2 -> 0.74.3
https://github.com/zim-desktop-wiki/zim-desktop-wiki/blob/0.74.3/CHANGELOG.md#0743---tue-07-dec-2021 Also fix problem with missing gi, and stop double-wrapping.
This commit is contained in:
parent
68a3707a2e
commit
ef5c9a329d
|
@ -7,18 +7,24 @@
|
||||||
|
|
||||||
python3Packages.buildPythonApplication rec {
|
python3Packages.buildPythonApplication rec {
|
||||||
pname = "zim";
|
pname = "zim";
|
||||||
version = "0.74.2";
|
version = "0.74.3";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://zim-wiki.org/downloads/zim-${version}.tar.gz";
|
url = "https://zim-wiki.org/downloads/zim-${version}.tar.gz";
|
||||||
sha256 = "sha256-tZxBlpps2nLThSOq3WJ42iUQ4NG1Lb463bvDQ+djZJA=";
|
sha256 = "sha256-3ehPIkhsf1JnC9Qx3kQ6ilvRaBB7auBm2C1HOuNGzRU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ gtk3 gobject-introspection wrapGAppsHook gnome.adwaita-icon-theme ];
|
buildInputs = [ gtk3 gobject-introspection gnome.adwaita-icon-theme ];
|
||||||
propagatedBuildInputs = with python3Packages; [ pyxdg pygobject3 ];
|
propagatedBuildInputs = with python3Packages; [ pyxdg pygobject3 ];
|
||||||
|
# see https://github.com/NixOS/nixpkgs/issues/56943#issuecomment-1131643663
|
||||||
|
nativeBuildInputs = [ gobject-introspection wrapGAppsHook ];
|
||||||
|
|
||||||
|
dontWrapGApps = true;
|
||||||
|
|
||||||
preFixup = ''
|
preFixup = ''
|
||||||
export makeWrapperArgs="--prefix XDG_DATA_DIRS : $out/share --argv0 $out/bin/.zim-wrapped"
|
makeWrapperArgs+=(--prefix XDG_DATA_DIRS : $out/share)
|
||||||
|
makeWrapperArgs+=(--argv0 $out/bin/.zim-wrapped)
|
||||||
|
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# RuntimeError: could not create GtkClipboard object
|
# RuntimeError: could not create GtkClipboard object
|
||||||
|
@ -31,6 +37,7 @@ python3Packages.buildPythonApplication rec {
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "A desktop wiki";
|
description = "A desktop wiki";
|
||||||
homepage = "https://zim-wiki.org/";
|
homepage = "https://zim-wiki.org/";
|
||||||
|
changelog = "https://github.com/zim-desktop-wiki/zim-desktop-wiki/blob/${version}/CHANGELOG.md";
|
||||||
license = licenses.gpl2Plus;
|
license = licenses.gpl2Plus;
|
||||||
maintainers = with maintainers; [ pSub ];
|
maintainers = with maintainers; [ pSub ];
|
||||||
broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/pull/52658#issuecomment-449565790
|
broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/pull/52658#issuecomment-449565790
|
||||||
|
|
Loading…
Reference in a new issue