diff options
Diffstat (limited to 'pkgs/applications/office')
-rw-r--r-- | pkgs/applications/office/beancount/bean-add.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/office/impressive/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/office/keepnote/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/office/scribus/default.nix | 8 | ||||
-rw-r--r-- | pkgs/applications/office/zim/default.nix | 2 |
5 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/applications/office/beancount/bean-add.nix b/pkgs/applications/office/beancount/bean-add.nix index ca003da9c46b..3afb7ce4b10a 100644 --- a/pkgs/applications/office/beancount/bean-add.nix +++ b/pkgs/applications/office/beancount/bean-add.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "09xdsskk5rc3xsf1v1vq7nkdxrxy8w2fixx2vdv8c97ak6a4hrca"; }; - propagatedBuildInputs = with python3Packages; [ python readline ]; + propagatedBuildInputs = with python3Packages; [ python ]; installPhase = '' mkdir -p $out/bin/ diff --git a/pkgs/applications/office/impressive/default.nix b/pkgs/applications/office/impressive/default.nix index 1422369d20ef..1a4461e2f8cf 100644 --- a/pkgs/applications/office/impressive/default.nix +++ b/pkgs/applications/office/impressive/default.nix @@ -1,8 +1,8 @@ -{ fetchurl, stdenv, pythonPackages, makeWrapper, lib +{ fetchurl, stdenv, python2Packages, makeWrapper, lib , xpdf, mesa, freeglut }: let - inherit (pythonPackages) python pyopengl pygame setuptools pillow; + inherit (python2Packages) python pyopengl pygame setuptools pillow; version = "0.10.5"; in stdenv.mkDerivation { # This project was formerly known as KeyJNote. diff --git a/pkgs/applications/office/keepnote/default.nix b/pkgs/applications/office/keepnote/default.nix index 3f3b5c2966c5..b8d04baf356d 100644 --- a/pkgs/applications/office/keepnote/default.nix +++ b/pkgs/applications/office/keepnote/default.nix @@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication { sha256 = "0nhkkv1n0lqf3zn17pxg5cgryv1wwlj4hfmhixwd76rcy8gs45dh"; }; - propagatedBuildInputs = with pythonPackages; [ sqlite3 pyGtkGlade ]; + propagatedBuildInputs = with pythonPackages; [ pyGtkGlade ]; # Testing fails. doCheck = false; diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index e1c80c50ee51..a6f0bccec96b 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -1,8 +1,10 @@ { stdenv, fetchurl, pkgconfig, freetype, lcms, libtiff, libxml2 -, libart_lgpl, qt4, pythonFull, cups, fontconfig, libjpeg +, libart_lgpl, qt4, python2, cups, fontconfig, libjpeg , zlib, libpng, xorg, cairo, podofo, aspell, boost, cmake }: -stdenv.mkDerivation rec { +let + pythonEnv = python2.withPackages(ps: [ps.tkinter]); +in stdenv.mkDerivation rec { name = "scribus-1.4.6"; src = fetchurl { @@ -14,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = with xorg; [ pkgconfig cmake freetype lcms libtiff libxml2 libart_lgpl qt4 - pythonFull cups fontconfig + pythonEnv cups fontconfig libjpeg zlib libpng podofo aspell cairo boost # for internal 2geom library libXaw libXext libX11 libXtst libXi libXinerama diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index ec33388f0869..cda8fc63a127 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -17,7 +17,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "15pdq4fxag85qjsrdmmssiq85qsk5vnbp8mrqnpvx8lm8crz6hjl"; }; - propagatedBuildInputs = with pythonPackages; [ sqlite3 pyGtkGlade pyxdg pygobject2 ]; + propagatedBuildInputs = with pythonPackages; [ pyGtkGlade pyxdg pygobject2 ]; preBuild = '' export HOME=$TMP |