MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 15:56:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #59058 from NixOS/update-zim

Browse source 
zim: 0.69.1 -> 0.70
This commit is contained in:
Pascal Wittmann 2019-04-06 19:10:12 +02:00 committed by GitHub
commit 6bccbe6372
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pkgs/applications/office/zim/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, python2Packages }:
{ stdenv, fetchurl, python3Packages, gtk3, gobject-introspection, wrapGAppsHook }:
#
# TODO: Declare configuration options for the following optional dependencies:
@ -7,22 +7,17 @@
# - pyxdg: Need to make it work first (see setupPyInstallFlags).
#
python2Packages.buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
name = "zim-${version}";
version = "0.69.1";
version = "0.70";
src = fetchurl {
url = "http://zim-wiki.org/downloads/${name}.tar.gz";
sha256 = "1yzb8x4mjp96zshcw7xbd4mvqn8zmbcm7cndskpxyk5yccyn5awq";
sha256 = "1g1xj86iph1a2k4n9yykq0gipbd5jdd7fsh9qpv4v2h5lggadjdd";
};
propagatedBuildInputs = with python2Packages; [ pyGtkGlade pyxdg pygobject2 ];
preBuild = ''
export HOME=$TMP
sed -i '/zim_install_class,/d' setup.py
'';
buildInputs = [ gtk3 gobject-introspection wrapGAppsHook ];
propagatedBuildInputs = with python3Packages; [ pyxdg pygobject3 ];
preFixup = ''