From 93eb9c6428653bed556eaddd78fcccaef2ee48c8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 26 Sep 2016 09:47:09 +0200 Subject: [PATCH] pythonSexy -> pythonPackages.libsexy --- pkgs/development/python-modules/libsexy/default.nix | 12 +++++------- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 3 +++ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/libsexy/default.nix b/pkgs/development/python-modules/libsexy/default.nix index 52a2c586f85..fa79cfa3be5 100644 --- a/pkgs/development/python-modules/libsexy/default.nix +++ b/pkgs/development/python-modules/libsexy/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, buildPythonPackage, libsexy, pkgconfig, libxml2, pygtk, pango, gtk2, glib, }: +{ stdenv, fetchurl, mkPythonDerivation, libsexy, pkgconfig, libxml2, pygtk, pango, gtk2, glib }: -stdenv.mkDerivation rec { - name = "python-libsexy-${version}"; +mkPythonDerivation rec { + name = "libsexy-${version}"; version = "0.1.9"; src = fetchurl { @@ -9,12 +9,10 @@ stdenv.mkDerivation rec { sha256 = "05bgcsxwkp63rlr8wg6znd46cfbhrzc5wh70jabsi654pxxjb39d"; }; - buildInputs = [ - pkgconfig pygtk - ]; + buildInputs = [ pkgconfig ]; propagatedBuildInputs = [ - libsexy gtk2 glib pango libxml2 + pygtk libsexy gtk2 glib pango libxml2 ]; postInstall = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8fb51b69a7e..aee0adf327c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3274,7 +3274,7 @@ in pythonIRClib = pythonPackages.pythonIRClib; - pythonSexy = callPackage ../development/python-modules/libsexy { }; + pythonSexy = pythonPackages.libsexy; pytrainer = callPackage ../applications/misc/pytrainer { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2b9ec272110..1f5ed0bfa88 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7406,6 +7406,9 @@ in modules // { }; }; + libsexy = callPackage ../development/python-modules/libsexy { + libsexy = pkgs.libsexy; + }; libthumbor = buildPythonPackage rec { name = "libthumbor-${version}";