diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-01-20 16:33:08 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-01-20 16:33:59 +0100 |
| commit | 6b6553c768b35241930e18fecc9a0e5b95e209b6 (patch) | |
| tree | fb1a8a642e40d051358d5ec9263b07861e209d2b /pkgs/applications/office | |
| parent | e3597b9ddf94234b9ec61d46782b7797334b4a4e (diff) | |
| parent | 5326cb7340e0cdc8a6f49291b3a127be9743a127 (diff) | |
| download | nixlib-6b6553c768b35241930e18fecc9a0e5b95e209b6.tar nixlib-6b6553c768b35241930e18fecc9a0e5b95e209b6.tar.gz nixlib-6b6553c768b35241930e18fecc9a0e5b95e209b6.tar.bz2 nixlib-6b6553c768b35241930e18fecc9a0e5b95e209b6.tar.lz nixlib-6b6553c768b35241930e18fecc9a0e5b95e209b6.tar.xz nixlib-6b6553c768b35241930e18fecc9a0e5b95e209b6.tar.zst nixlib-6b6553c768b35241930e18fecc9a0e5b95e209b6.zip | |
Merge branch 'staging'
It contains security updates. I somehow forgot to push this yesterday.
Diffstat (limited to 'pkgs/applications/office')
| -rw-r--r-- | pkgs/applications/office/zim/default.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index 313239581a1a..227b982689e1 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pythonPackages }: +{ stdenv, lib, fetchurl, python2Packages }: # # TODO: Declare configuration options for the following optional dependencies: @@ -7,17 +7,16 @@ # - pyxdg: Need to make it work first (see setupPyInstallFlags). # -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { name = "zim-${version}"; version = "0.65"; - namePrefix = ""; src = fetchurl { url = "http://zim-wiki.org/downloads/${name}.tar.gz"; sha256 = "15pdq4fxag85qjsrdmmssiq85qsk5vnbp8mrqnpvx8lm8crz6hjl"; }; - propagatedBuildInputs = with pythonPackages; [ pyGtkGlade pyxdg pygobject2 ]; + propagatedBuildInputs = with python2Packages; [ pyGtkGlade pyxdg pygobject2 ]; preBuild = '' export HOME=$TMP |