diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-08-06 10:09:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-06 10:09:10 +0200 |
| commit | 585bf4039a89cbb47a12c5e00ab820ac56cec6c1 (patch) | |
| tree | 99986b2e6c7d6394ee59eea99ed0d2a17adcba33 | |
| parent | 66a682554fca12d5e74d3584932066c6cc5d1540 (diff) | |
| parent | 01232229226cd028ce900f2f51485b1f1a4ace37 (diff) | |
| download | nixpkgs-585bf4039a89cbb47a12c5e00ab820ac56cec6c1.tar nixpkgs-585bf4039a89cbb47a12c5e00ab820ac56cec6c1.tar.gz nixpkgs-585bf4039a89cbb47a12c5e00ab820ac56cec6c1.tar.bz2 nixpkgs-585bf4039a89cbb47a12c5e00ab820ac56cec6c1.tar.lz nixpkgs-585bf4039a89cbb47a12c5e00ab820ac56cec6c1.tar.xz nixpkgs-585bf4039a89cbb47a12c5e00ab820ac56cec6c1.tar.zst nixpkgs-585bf4039a89cbb47a12c5e00ab820ac56cec6c1.zip | |
Merge pull request #132862 from SuperSandro2000/zim
zim: format, cleanup
| -rw-r--r-- | pkgs/applications/office/zim/default.nix | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index abbc0c8a548..c0bca4c9043 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -1,25 +1,22 @@ { lib, stdenv, fetchurl, python3Packages, gtk3, gobject-introspection, wrapGAppsHook, gnome }: -# # TODO: Declare configuration options for the following optional dependencies: # - File stores: hg, git, bzr # - Included plugins depenencies: dot, ditaa, dia, any other? # - pyxdg: Need to make it work first (see setupPyInstallFlags). -# python3Packages.buildPythonApplication rec { - name = "zim-${version}"; + pname = "zim"; version = "0.73.5"; src = fetchurl { - url = "https://zim-wiki.org/downloads/${name}.tar.gz"; + url = "https://zim-wiki.org/downloads/zim-${version}.tar.gz"; sha256 = "sha256-o28V2Sw5lMDVWwf4MlOz2LgmvrNxSGXturwU8cyR1jo="; }; buildInputs = [ gtk3 gobject-introspection wrapGAppsHook gnome.adwaita-icon-theme ]; propagatedBuildInputs = with python3Packages; [ pyxdg pygobject3 ]; - preFixup = '' export makeWrapperArgs="--prefix XDG_DATA_DIRS : $out/share --argv0 $out/bin/.zim-wrapped" ''; @@ -28,13 +25,12 @@ python3Packages.buildPythonApplication rec { doCheck = false; checkPhase = '' - python test.py + ${python3Packages.python.interpreter} test.py ''; - meta = with lib; { description = "A desktop wiki"; - homepage = "http://zim-wiki.org"; + homepage = "https://zim-wiki.org/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ pSub ]; broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/pull/52658#issuecomment-449565790 |