diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2016-08-14 13:52:23 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2016-08-14 13:52:42 +0200 |
commit | 7986b718f3129332454f105d86fb30ab78812943 (patch) | |
tree | 9d8f5c14d52c96dc01222613d77cc4defdbab487 /pkgs/applications/version-management/meld | |
parent | dc24b7df63ae959d0d97e97aab125d85d5168a17 (diff) | |
download | nixlib-7986b718f3129332454f105d86fb30ab78812943.tar nixlib-7986b718f3129332454f105d86fb30ab78812943.tar.gz nixlib-7986b718f3129332454f105d86fb30ab78812943.tar.bz2 nixlib-7986b718f3129332454f105d86fb30ab78812943.tar.lz nixlib-7986b718f3129332454f105d86fb30ab78812943.tar.xz nixlib-7986b718f3129332454f105d86fb30ab78812943.tar.zst nixlib-7986b718f3129332454f105d86fb30ab78812943.zip |
Remove pycairo from top-level
See #11567.
Diffstat (limited to 'pkgs/applications/version-management/meld')
-rw-r--r-- | pkgs/applications/version-management/meld/default.nix | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 99e45438984d..503ae4e90b9c 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -1,16 +1,14 @@ -{ stdenv, fetchurl, itstool, buildPythonApplication, python27, intltool, wrapGAppsHook -, libxml2, pygobject3, gobjectIntrospection, gtk3, gnome3, pycairo, cairo, file +{ stdenv, fetchurl, itstool, pythonPackages, intltool, wrapGAppsHook +, libxml2, gobjectIntrospection, gtk3, gnome3, cairo, file }: let minor = "3.16"; version = "${minor}.2"; -in - -buildPythonApplication rec { + inherit (pythonPackages) python buildPythonApplication pycairo pygobject3; +in buildPythonApplication rec { name = "meld-${version}"; - namePrefix = ""; src = fetchurl { url = "mirror://gnome/sources/meld/${minor}/meld-${version}.tar.xz"; @@ -18,19 +16,19 @@ buildPythonApplication rec { }; buildInputs = [ - python27 intltool wrapGAppsHook itstool libxml2 + intltool wrapGAppsHook itstool libxml2 gnome3.gtksourceview gnome3.gsettings_desktop_schemas pycairo cairo gnome3.defaultIconTheme gnome3.dconf file ]; propagatedBuildInputs = [ gobjectIntrospection pygobject3 gtk3 ]; installPhase = '' - mkdir -p "$out/lib/${python27.libPrefix}/site-packages" + mkdir -p "$out/lib/${python.libPrefix}/site-packages" - export PYTHONPATH="$out/lib/${python27.libPrefix}/site-packages:$PYTHONPATH" + export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" - ${python27}/bin/${python27.executable} setup.py install \ - --install-lib=$out/lib/${python27.libPrefix}/site-packages \ + ${python}/bin/${python.executable} setup.py install \ + --install-lib=$out/lib/${python.libPrefix}/site-packages \ --prefix="$out" mkdir -p $out/share/gsettings-schemas/$name |