diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2015-12-08 15:11:00 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2015-12-08 15:11:00 +0100 |
commit | 60e2dced1a698e5d918c4b6a91778fdf5cb23c20 (patch) | |
tree | 4b98693e01db7e8e4c16fe126bb14b534dcd301a /pkgs | |
parent | a044b590fcc77f9272ed4de227a79f0470841e5e (diff) | |
download | nixlib-60e2dced1a698e5d918c4b6a91778fdf5cb23c20.tar nixlib-60e2dced1a698e5d918c4b6a91778fdf5cb23c20.tar.gz nixlib-60e2dced1a698e5d918c4b6a91778fdf5cb23c20.tar.bz2 nixlib-60e2dced1a698e5d918c4b6a91778fdf5cb23c20.tar.lz nixlib-60e2dced1a698e5d918c4b6a91778fdf5cb23c20.tar.xz nixlib-60e2dced1a698e5d918c4b6a91778fdf5cb23c20.tar.zst nixlib-60e2dced1a698e5d918c4b6a91778fdf5cb23c20.zip |
mirage: use pillow instead of pil
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/graphics/mirage/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/applications/graphics/mirage/default.nix b/pkgs/applications/graphics/mirage/default.nix index 20f7460f7a16..c4b14388d1ba 100644 --- a/pkgs/applications/graphics/mirage/default.nix +++ b/pkgs/applications/graphics/mirage/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonPackage, python, pygtk, pil, libX11, gettext }: +{ stdenv, fetchurl, buildPythonPackage, python, pygtk, pillow, libX11, gettext }: buildPythonPackage rec { namePrefix = ""; @@ -17,7 +17,7 @@ buildPythonPackage rec { sed -i "s@/usr/local/share/locale@$out/share/locale@" mirage.py ''; - pythonPath = [ pygtk pil ]; + propagatedBuildInputs = [ pygtk pillow ]; meta = { description = "Simple image viewer written in PyGTK"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe50da49b0ec..eefd5e96f089 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12371,7 +12371,10 @@ let mimms = callPackage ../applications/audio/mimms {}; - mirage = callPackage ../applications/graphics/mirage {}; + mirage = callPackage ../applications/graphics/mirage { + inherit (pythonPackages) pygtk; + inherit (pythonPackages) pillow; + }; mixxx = callPackage ../applications/audio/mixxx { inherit (vamp) vampSDK; |