diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-04-22 21:15:06 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-04-22 21:18:23 +0000 |
| commit | b935ae5f3cfb2bb4f9a3746d284f156a6dece505 (patch) | |
| tree | 5efe4e2e7a7723a737d0130a333b057c5e76df40 /nixpkgs/pkgs/applications/office/zim | |
| parent | dc9566e91c9453378c24e98b5737234364670df5 (diff) | |
| parent | d26027792812fbfad4d0f451b5f47fdabf7fdeb9 (diff) | |
| download | nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.tar nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.tar.gz nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.tar.bz2 nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.tar.lz nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.tar.xz nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.tar.zst nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.zip | |
Merge commit 'd26027792812fbfad4d0f451b5f47fdabf7fdeb9'
Diffstat (limited to 'nixpkgs/pkgs/applications/office/zim')
| -rw-r--r-- | nixpkgs/pkgs/applications/office/zim/default.nix | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/nixpkgs/pkgs/applications/office/zim/default.nix b/nixpkgs/pkgs/applications/office/zim/default.nix index 48027c194da6..81c254763d3a 100644 --- a/nixpkgs/pkgs/applications/office/zim/default.nix +++ b/nixpkgs/pkgs/applications/office/zim/default.nix @@ -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 = '' |