From b4390eaac3ab176a650864a3252b3921c4da0c4e Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 12 Mar 2016 02:54:29 +0300 Subject: [PATCH] enlightenment.econnman: cleanup, use python wrapper --- pkgs/desktops/enlightenment/econnman.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/enlightenment/econnman.nix b/pkgs/desktops/enlightenment/econnman.nix index f1ffe7cd604..0dabd7f1347 100644 --- a/pkgs/desktops/enlightenment/econnman.nix +++ b/pkgs/desktops/enlightenment/econnman.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, efl, elementary, python27, python27Packages, dbus, makeWrapper }: +{ stdenv, fetchurl, pkgconfig, efl, elementary, python2Packages, dbus, makeWrapper }: stdenv.mkDerivation rec { name = "econnman-${version}"; version = "1.1"; @@ -7,10 +7,10 @@ stdenv.mkDerivation rec { sha256 = "057pwwavlvrrq26bncqnfrf449zzaim0zq717xv86av4n940gwv0"; }; - buildInputs = [ makeWrapper pkgconfig efl python27 dbus ]; - propagatedBuildInputs = [ python27Packages.pythonefl python27Packages.dbus elementary ]; + buildInputs = [ makeWrapper pkgconfig efl python2Packages.python python2Packages.wrapPython dbus ]; + pythonPath = [ python2Packages.pythonefl python2Packages.dbus elementary ]; postInstall = '' - wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl}/lib/python2.7/site-packages + wrapPythonPrograms ''; meta = {