diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-09-13 12:51:34 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-09-13 12:51:34 +0300 |
| commit | 47487099263220f788dcbde58848b9a06801bc86 (patch) | |
| tree | 4d25739ec07de84e0096b9980f7bbad20dbb43a1 /pkgs/applications/version-management | |
| parent | 9c47876b84e5ec1701478afc90f48326d71aa803 (diff) | |
| parent | a769e0ffae239e62f368f5a21c3e00a849dd5531 (diff) | |
| download | nixlib-47487099263220f788dcbde58848b9a06801bc86.tar nixlib-47487099263220f788dcbde58848b9a06801bc86.tar.gz nixlib-47487099263220f788dcbde58848b9a06801bc86.tar.bz2 nixlib-47487099263220f788dcbde58848b9a06801bc86.tar.lz nixlib-47487099263220f788dcbde58848b9a06801bc86.tar.xz nixlib-47487099263220f788dcbde58848b9a06801bc86.tar.zst nixlib-47487099263220f788dcbde58848b9a06801bc86.zip | |
Merge commit 'refs/pull/18498/head' of git://github.com/NixOS/nixpkgs
Diffstat (limited to 'pkgs/applications/version-management')
| -rw-r--r-- | pkgs/applications/version-management/rabbitvcs/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/version-management/smartgithg/default.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/version-management/rabbitvcs/default.nix b/pkgs/applications/version-management/rabbitvcs/default.nix index 212151b6c4a9..019296550819 100644 --- a/pkgs/applications/version-management/rabbitvcs/default.nix +++ b/pkgs/applications/version-management/rabbitvcs/default.nix @@ -11,7 +11,7 @@ python2Packages.buildPythonApplication rec { sha256 = "0964pdylrx4n9c9l8ncwv4q1p63y4hadb5v4pgvm0m2fah2jlkly"; }; - pythonPath = with python2Packages; [ configobj dbus-python pygobject pygtk simplejson pysvn dulwich tkinter gvfs xdg_utils ]; + pythonPath = with python2Packages; [ configobj dbus-python pygobject2 pygtk simplejson pysvn dulwich tkinter gvfs xdg_utils ]; prePatch = '' sed -ie 's|if sys\.argv\[1\] == "install":|if False:|' ./setup.py diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index 51d70156e9ce..485e8cc6c21e 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, lib, makeWrapper , jre -, gtk, glib +, gtk2, glib , libXtst , git, mercurial, subversion , which @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { which ]; runtime_lib_paths = lib.makeLibraryPath [ - gtk glib + gtk2 glib libXtst ]; in '' |