public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit 'refs/pull/18498/head' of git://github.com/NixOS/nixpkgs

Browse Source
This commit is contained in:
Nikolay Amiantov
2016-09-13 12:51:34 +03:00
parent 9c47876b84 a769e0ffae
commit 4748709926
340 changed files with 898 additions and 873 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/python-modules/libsexy/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, buildPythonPackage, libsexy, pkgconfig, libxml2, pygtk, pango, gtk, glib, }:
{ stdenv, fetchurl, buildPythonPackage, libsexy, pkgconfig, libxml2, pygtk, pango, gtk2, glib, }:
stdenv.mkDerivation rec {
name = "python-libsexy-${version}";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
];
propagatedBuildInputs = [
libsexy gtk glib pango libxml2
libsexy gtk2 glib pango libxml2
];
postInstall = ''

8
pkgs/development/python-modules/pygtk/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, python, pkgconfig, gtk, pygobject, pycairo
{ stdenv, fetchurl, python, pkgconfig, gtk2, pygobject2, pycairo
, buildPythonPackage, libglade ? null, isPy3k }:
buildPythonPackage rec {
@@ -14,7 +14,7 @@ buildPythonPackage rec {
buildInputs = [ pkgconfig ]
++ stdenv.lib.optional (libglade != null) libglade;
propagatedBuildInputs = [ gtk pygobject pycairo ];
propagatedBuildInputs = [ gtk2 pygobject2 pycairo ];
configurePhase = "configurePhase";
@@ -43,8 +43,8 @@ buildPythonPackage rec {
postInstall = ''
rm $out/bin/pygtk-codegen-2.0
ln -s ${pygobject}/bin/pygobject-codegen-2.0 $out/bin/pygtk-codegen-2.0
ln -s ${pygobject}/lib/${python.libPrefix}/site-packages/pygobject-${pygobject.version}.pth \
ln -s ${pygobject2}/bin/pygobject-codegen-2.0 $out/bin/pygtk-codegen-2.0
ln -s ${pygobject2}/lib/${python.libPrefix}/site-packages/pygobject-${pygobject2.version}.pth \
$out/lib/${python.libPrefix}/site-packages/${name}.pth
'';
}

4
pkgs/development/python-modules/pygtksourceview/default.nix
View File

@@ -1,4 +1,4 @@
{ lib, fetchurl, python, mkPythonDerivation, pkgconfig, pygobject, glib, pygtk, gnome2 }:
{ lib, fetchurl, python, mkPythonDerivation, pkgconfig, pygobject2, glib, pygtk, gnome2 }:
let version = "2.10.1"; in
@@ -12,7 +12,7 @@ mkPythonDerivation {
patches = [ ./codegendir.patch ];
buildInputs = [ python pkgconfig pygobject glib pygtk gnome2.gtksourceview ];
buildInputs = [ python pkgconfig pygobject2 glib pygtk gnome2.gtksourceview ];
meta = {
platforms = lib.platforms.unix;