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

tigervnc: Drop dependency on libxcrypt 

http://hydra.nixos.org/build/3875072
This commit is contained in:
Eelco Dolstra 2013-01-28 15:53:51 +01:00
parent 5cad2c497d
commit 2dc0e9070e
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/tools/admin/tigervnc/default.nix
View File

@ -4,7 +4,7 @@
, fixesproto, damageproto, xcmiscproto, bigreqsproto, randrproto, renderproto , fixesproto, damageproto, xcmiscproto, bigreqsproto, randrproto, renderproto
, fontsproto, videoproto, compositeproto, scrnsaverproto, resourceproto , fontsproto, videoproto, compositeproto, scrnsaverproto, resourceproto
, libxkbfile, libXfont, libpciaccess, cmake, libjpeg_turbo, libXft, fltk, libXinerama , libxkbfile, libXfont, libpciaccess, cmake, libjpeg_turbo, libXft, fltk, libXinerama
, xineramaproto, libXcursor, fetchsvn, libxcrypt , xineramaproto, libXcursor, fetchsvn
}: }:
with stdenv.lib; with stdenv.lib;
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
revision = 5005; revision = 5005;
version = "r${toString revision}"; version = "r${toString revision}";
name = "tigervnc-${version}"; name = "tigervnc-${version}";
src = fetchsvn { src = fetchsvn {
# Release url = "mirror://sourceforge/tigervnc/${version}/${name}.tar.gz"; # Release url = "mirror://sourceforge/tigervnc/${version}/${name}.tar.gz";
url = "https://tigervnc.svn.sourceforge.net/svnroot/tigervnc/trunk"; url = "https://tigervnc.svn.sourceforge.net/svnroot/tigervnc/trunk";
@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
patchPhase = '' patchPhase = ''
sed -i -e 's,$(includedir)/pixman-1,${if stdenv ? cross then pixman.crossDrv else pixman}/include/pixman-1,' unix/xserver/hw/vnc/Makefile.am sed -i -e 's,$(includedir)/pixman-1,${if stdenv ? cross then pixman.crossDrv else pixman}/include/pixman-1,' unix/xserver/hw/vnc/Makefile.am
sed -i -e '/^$pidFile/a$ENV{XKB_BINDIR}="${if stdenv ? cross then xkbcomp.crossDrv else xkbcomp}/bin";' unix/vncserver sed -i -e '/^$pidFile/a$ENV{XKB_BINDIR}="${if stdenv ? cross then xkbcomp.crossDrv else xkbcomp}/bin";' unix/vncserver
sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${if stdenv ? cross then xkeyboard_config.crossDrv else xkeyboard_config}/etc/X11/xkb";' unix/vncserver sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${if stdenv ? cross then xkeyboard_config.crossDrv else xkeyboard_config}/etc/X11/xkb";' unix/vncserver
fontPath= fontPath=
for i in $fontDirectories; do for i in $fontDirectories; do
@ -35,8 +35,8 @@ stdenv.mkDerivation rec {
addToSearchPathWithCustomDelimiter "," fontPath $(dirname $j) addToSearchPathWithCustomDelimiter "," fontPath $(dirname $j)
done done
done done
sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -fp '"$fontPath"'";' unix/vncserver sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -fp '"$fontPath"'";' unix/vncserver
''; '';
# I don't know why I can't use in the script # I don't know why I can't use in the script
@ -79,13 +79,13 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ libX11 libXext gettext libICE libXtst libXi libSM libXft [ libX11 libXext gettext libICE libXtst libXi libSM libXft
nasm libgcrypt gnutls pam pixman libjpeg_turbo fltk xineramaproto nasm libgcrypt gnutls pam pixman libjpeg_turbo fltk xineramaproto
libXinerama libXcursor libxcrypt libXinerama libXcursor
]; ];
nativeBuildInputs = nativeBuildInputs =
[ autoconf automake cvs utilmacros fontutil libtool flex bison [ autoconf automake cvs utilmacros fontutil libtool flex bison
cmake cmake
] ]
++ xorgserver.nativeBuildInputs; ++ xorgserver.nativeBuildInputs;
propagatedNativeBuildInputs = xorgserver.propagatedNativeBuildInputs; propagatedNativeBuildInputs = xorgserver.propagatedNativeBuildInputs;
@ -97,5 +97,4 @@ stdenv.mkDerivation rec {
maintainers = with stdenv.lib.maintainers; [viric]; maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux; platforms = with stdenv.lib.platforms; linux;
}; };
} }