From 3ab7bfeb30f3edc86a5063c06a64386234f2cf75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 4 Sep 2016 09:39:17 +0200 Subject: [PATCH] pygtk: fix broken symlink ${pygobject.name} now contains a python2- prefix resulting in a broken symlink. this breaks pygtk and every depending application --- pkgs/development/python-modules/pygobject/default.nix | 5 +++-- pkgs/development/python-modules/pygtk/default.nix | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix index 0bbe4ffb3c2..6723ba6b6a5 100644 --- a/pkgs/development/python-modules/pygobject/default.nix +++ b/pkgs/development/python-modules/pygobject/default.nix @@ -1,8 +1,9 @@ { stdenv, fetchurl, python, mkPythonDerivation, pkgconfig, glib }: mkPythonDerivation rec { - name = "pygobject-2.28.6"; - + name = "pygobject-${version}"; + version = "2.28.6"; + src = fetchurl { url = "mirror://gnome/sources/pygobject/2.28/${name}.tar.xz"; sha256 = "1f5dfxjnil2glfwxnqr14d2cjfbkghsbsn8n04js2c2icr7iv2pv"; diff --git a/pkgs/development/python-modules/pygtk/default.nix b/pkgs/development/python-modules/pygtk/default.nix index 60aa65323d7..5354d9750f4 100644 --- a/pkgs/development/python-modules/pygtk/default.nix +++ b/pkgs/development/python-modules/pygtk/default.nix @@ -44,7 +44,7 @@ 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.name}.pth \ + ln -s ${pygobject}/lib/${python.libPrefix}/site-packages/pygobject-${pygobject.version}.pth \ $out/lib/${python.libPrefix}/site-packages/${name}.pth ''; }