JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zim: do not use top-level python packages

Browse Source
This commit is contained in:
Frederik Rietdijk 2016-09-26 10:21:52 +02:00
parent f84bc4e505
commit 804de7d820
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/office/zim/default.nix
View File

@ -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

4
pkgs/top-level/all-packages.nix
View File

@ -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;