diff options
| author | Marc Weber <marco-oweber@gmx.de> | 2010-05-28 10:57:50 +0000 |
|---|---|---|
| committer | Marc Weber <marco-oweber@gmx.de> | 2010-05-28 10:57:50 +0000 |
| commit | 932899f3daf78bcb8fd2f56ef17732ddde0d1b0d (patch) | |
| tree | b87ce1cbad0a4cd7969fe6f82b0c6bf65a28d9f1 /pkgs/applications/version-management/mercurial | |
| parent | 629849c44972899a442926b182d760b5f21c72bb (diff) | |
| download | nixlib-932899f3daf78bcb8fd2f56ef17732ddde0d1b0d.tar nixlib-932899f3daf78bcb8fd2f56ef17732ddde0d1b0d.tar.gz nixlib-932899f3daf78bcb8fd2f56ef17732ddde0d1b0d.tar.bz2 nixlib-932899f3daf78bcb8fd2f56ef17732ddde0d1b0d.tar.lz nixlib-932899f3daf78bcb8fd2f56ef17732ddde0d1b0d.tar.xz nixlib-932899f3daf78bcb8fd2f56ef17732ddde0d1b0d.tar.zst nixlib-932899f3daf78bcb8fd2f56ef17732ddde0d1b0d.zip | |
Tk version number is now 8.5 but at several places TK_LIBRARY is set "${tk}/lib/tk8.4". As for Python, tk.libPrefix is introduced to match "tk8.5".
contributed by David Guibert Signed-off-by: David Guibert <david.guibert@gmail.com> svn path=/nixpkgs/trunk/; revision=22041
Diffstat (limited to 'pkgs/applications/version-management/mercurial')
| -rw-r--r-- | pkgs/applications/version-management/mercurial/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 198d14395144..054dd0c1813a 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { hgk=$out/lib/${python.libPrefix}/site-packages/hgext/hgk.py EOF # setting HG so that hgk can be run itself as well (not only hg view) - WRAP_TK=" --set TK_LIBRARY \"${tk}/lib/tk8.4\" + WRAP_TK=" --set TK_LIBRARY \"${tk}/lib/${tk.libPrefix}\" --set HG \"$out/bin/hg\" --prefix PATH : \"${tk}/bin\" " '' |