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

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".

Browse Source 
contributed by David Guibert
Signed-off-by: David Guibert <david.guibert@gmail.com>

svn path=/nixpkgs/trunk/; revision=22041
This commit is contained in:
Marc Weber 2010-05-28 10:57:50 +00:00
parent 629849c449
commit 932899f3da
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/misc/wordnet/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation {
"--with-tk=" + tk + "/lib"; "--with-tk=" + tk + "/lib";
postInstall = '' postInstall = ''
wrapProgram $out/bin/wishwn --set TK_LIBRARY "${tk}/lib/tk8.4" wrapProgram $out/bin/wishwn --set TK_LIBRARY "${tk}/lib/${tk.libPrefix}"
wrapProgram $out/bin/wnb --prefix PATH : "$out/bin" wrapProgram $out/bin/wnb --prefix PATH : "$out/bin"
''; '';

2
pkgs/applications/version-management/git-and-tools/git/default.nix
View File

@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
for prog in bin/gitk libexec/git-core/git-gui for prog in bin/gitk libexec/git-core/git-gui
do do
wrapProgram "$out/$prog" \ wrapProgram "$out/$prog" \
--set TK_LIBRARY "${tk}/lib/tk8.4" \ --set TK_LIBRARY "${tk}/lib/${tk.libPrefix}" \
--prefix PATH : "${tk}/bin" --prefix PATH : "${tk}/bin"
done done
'' else '' '' else ''

2
pkgs/applications/version-management/git-and-tools/git/git-git.nix
View File

@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
+ (if guiSupport then '' + (if guiSupport then ''
# Wrap Tcl/Tk programs # Wrap Tcl/Tk programs
wrapArgs="$wrapArgs --set TK_LIBRARY ${tk}/lib/tk8.4" wrapArgs="$wrapArgs --set TK_LIBRARY ${tk}/lib/${tk.libPrefix}"
wrapArgs="$wrapArgs --prefix PATH : ${tk}/bin" wrapArgs="$wrapArgs --prefix PATH : ${tk}/bin"
'' else "") '' else "")

2
pkgs/applications/version-management/mercurial/default.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
hgk=$out/lib/${python.libPrefix}/site-packages/hgext/hgk.py hgk=$out/lib/${python.libPrefix}/site-packages/hgext/hgk.py
EOF EOF
# setting HG so that hgk can be run itself as well (not only hg view) # 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\" --set HG \"$out/bin/hg\"
--prefix PATH : \"${tk}/bin\" " --prefix PATH : \"${tk}/bin\" "
'' ''

4
pkgs/development/libraries/tk/default.nix
View File

@ -19,4 +19,8 @@ stdenv.mkDerivation {
buildInputs = [tcl x11]; buildInputs = [tcl x11];
inherit tcl; inherit tcl;
passthru = {
libPrefix = "tk8.5";
};
} }