diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2016-09-26 10:21:52 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2016-09-26 11:10:50 +0200 |
| commit | 804de7d8208376a9ba7d3c77d34dd043bc953803 (patch) | |
| tree | d5197c0964fcfbcf5efda0bdaac2190fdc9895c1 | |
| parent | f84bc4e5057495c85f29544aa9527108c0971ca0 (diff) | |
| download | nixlib-804de7d8208376a9ba7d3c77d34dd043bc953803.tar nixlib-804de7d8208376a9ba7d3c77d34dd043bc953803.tar.gz nixlib-804de7d8208376a9ba7d3c77d34dd043bc953803.tar.bz2 nixlib-804de7d8208376a9ba7d3c77d34dd043bc953803.tar.lz nixlib-804de7d8208376a9ba7d3c77d34dd043bc953803.tar.xz nixlib-804de7d8208376a9ba7d3c77d34dd043bc953803.tar.zst nixlib-804de7d8208376a9ba7d3c77d34dd043bc953803.zip | |
zim: do not use top-level python packages
| -rw-r--r-- | pkgs/applications/office/zim/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index 6f2cb29e4364..ec33388f0869 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, buildPythonApplication, pythonPackages, pygtk, pygobject2, python }: +{ stdenv, lib, fetchurl, pythonPackages }: # # TODO: Declare configuration options for the following optional dependencies: @@ -7,7 +7,7 @@ # - pyxdg: Need to make it work first (see setupPyInstallFlags). # -buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { name = "zim-${version}"; version = "0.65"; namePrefix = ""; @@ -17,7 +17,7 @@ buildPythonApplication rec { sha256 = "15pdq4fxag85qjsrdmmssiq85qsk5vnbp8mrqnpvx8lm8crz6hjl"; }; - propagatedBuildInputs = [ pythonPackages.sqlite3 pygtk pythonPackages.pyxdg pygobject2 ]; + propagatedBuildInputs = with pythonPackages; [ sqlite3 pyGtkGlade pyxdg pygobject2 ]; preBuild = '' export HOME=$TMP diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a7200666939..5806e9f6129f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15846,9 +15846,7 @@ in SDL = SDL_sixel; }; - zim = callPackage ../applications/office/zim { - pygtk = pyGtkGlade; - }; + zim = callPackage ../applications/office/zim { }; zotero = callPackage ../applications/office/zotero { firefox = firefox-esr-unwrapped; |