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

fix various builds by updating perl URI package update perl URI package

Browse Source 
fix expect: Neither was the executable installed nor the shared library
fix topGit source
update synergy fixing build

svn path=/nixpkgs/trunk/; revision=19064
This commit is contained in:
Marc Weber 2009-12-21 08:55:31 +00:00
parent 8058166fe0
commit 1106d431fc
5 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkgs/applications/misc/synergy/default.nix
View File

@ -2,24 +2,21 @@ args: with args;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "synergy-cvs"; name = "synergy-cvs";
# REGION AUTO UPDATE: { name="synergy"; type = "cvs"; cvsRoot = ":pserver:anonymous@synergy2.cvs.sourceforge.net:/cvsroot/synergy2"; module="syngery"; } # note: There is a fork:
src = sourceFromHead "synergy-F_09-55-29.tar.gz" # http://code.google.com/p/synergy-plus
(fetchurl { url = "http://mawercer.de/~nix/repos/synergy-F_09-55-28.tar.gz"; sha256 = "443bb8cf8d4e365b2adaadd8770096fcafa0c54532e83f6a267eb3b05042b84c"; });
# END
/*
fetchcvs {
cvsRoot = ":pserver:anonymous@synergy2.cvs.sourceforge.net:/cvsroot/synergy2";
module = "synergy";
date = "NOW";
sha256 = "0a52b3adaae5f41cf16c5911c9037c5f2ee704a27bcaa9f874e3a4ff58d773c1";
};
*/
buildInputs = [x11 xextproto libXtst inputproto libXi]; # REGION AUTO UPDATE: { name="synergy"; type = "cvs"; cvsRoot = ":pserver:anonymous@synergy2.cvs.sourceforge.net:/cvsroot/synergy2"; module="syngery"; }
src= sourceFromHead "synergy-F_23-55-02.tar.gz"
(fetchurl { url = "http://mawercer.de/~nix/repos/synergy-F_23-55-02.tar.gz"; sha256 = "ae16a9b59039a32e383e71397405d7b610de6c6902c03177c2496bac440d3e28"; });
# END
buildInputs = [x11 xextproto libXtst inputproto libXi automake autoconf autoconf];
preConfigure = "autoreconf; ";
patches = [ (fetchurl { patches = [ (fetchurl {
url = http://mawercer.de/~nix/syncergy-gcc43.patch.gz; url = http://mawercer.de/~nix/synergy-gcc43-r2.patch.gz;
sha256 = "12kla0nii6qc9fy5x4dc4qisfcyl9dqnrj5y911davnvwkwlj18h"; sha256 = "0wnj5k93ybj7jg8ml1i1brwsnszfh41117q2qh7r8xr9m37997b7";
}) ]; }) ];
meta= { meta= {

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

@ -47,8 +47,8 @@ rec {
topGit = stdenv.mkDerivation { topGit = stdenv.mkDerivation {
name = "TopGit-git"; # official release 0.8 name = "TopGit-git"; # official release 0.8
# REGION AUTO UPDATE: { name = "topGit"; type="git"; url="http://repo.or.cz/w/topgit.git"; } # REGION AUTO UPDATE: { name = "topGit"; type="git"; url="http://repo.or.cz/w/topgit.git"; }
src = sourceFromHead "topGit-f59e4f9e87e5f485fdaee0af002edd2105fa298a.tar.gz" src= sourceFromHead "topGit-341a3713f5c399f97c5c68a74772b12bb3d2ca57.tar.gz"
(fetchurl { url = "http://mawercer.de/~nix/repos/topGit-f59e4f9e87e5f485fdaee0af002edd2105fa298a.tar.gz"; sha256 = "12aa6d34c82d505066b851e24069fe9d6930d70913b7d94a0cc6e8f06f127170"; }); (fetchurl { url = "http://mawercer.de/~nix/repos/topGit-341a3713f5c399f97c5c68a74772b12bb3d2ca57.tar.gz"; sha256 = "4d53343ed9ba735fb598d6576b20f2641d5a8374a5a11b21fcbcdc6da885e872"; });
# END # END
phases="unpackPhase patchPhase installPhase"; phases="unpackPhase patchPhase installPhase";
installPhase = '' installPhase = ''

2
pkgs/tools/misc/expect/default.nix
View File

@ -20,6 +20,7 @@ stdenv.mkDerivation {
patchPhase = '' patchPhase = ''
substituteInPlace configure --replace /bin/stty "$(type -tP stty)" substituteInPlace configure --replace /bin/stty "$(type -tP stty)"
sed -e '1i\#include <tclInt.h>' -i exp_inter.c sed -e '1i\#include <tclInt.h>' -i exp_inter.c
export NIX_LDFLAGS="-rpath $out/lib $NIX_LDFLAGS"
''; '';
configureFlags = ["--with-tcl=${tcl}/lib" configureFlags = ["--with-tcl=${tcl}/lib"
@ -31,4 +32,5 @@ stdenv.mkDerivation {
description = "A tool for automating interactive applications"; description = "A tool for automating interactive applications";
homepage = http://expect.nist.gov/; homepage = http://expect.nist.gov/;
}; };
postInstall="cp expect{,k} $out/bin; ensureDir $out/lib; cp *.so $out/lib";
} }

2
pkgs/top-level/all-packages.nix
View File

@ -7440,7 +7440,7 @@ let
# linux only by now # linux only by now
synergy = import ../applications/misc/synergy { synergy = import ../applications/misc/synergy {
inherit fetchurl sourceFromHead stdenv x11; inherit fetchurl sourceFromHead stdenv x11 automake autoconf;
inherit (xlibs) xextproto libXtst inputproto libXi; inherit (xlibs) xextproto libXtst inputproto libXi;
}; };

4
pkgs/top-level/perl-packages.nix
View File

@ -2430,10 +2430,10 @@ rec {
}; };
URI = buildPerlPackage rec { URI = buildPerlPackage rec {
name = "URI-1.37"; name = "URI-1.51";
src = fetchurl { src = fetchurl {
url = "mirror://cpan/authors/id/G/GA/GAAS/${name}.tar.gz"; url = "mirror://cpan/authors/id/G/GA/GAAS/${name}.tar.gz";
sha256 = "0amwbss2gz00fkdfnfixf1afmqal1246xhmj27g5c0ny7ahcid0j"; sha256 = "0gfdphz0yhm62vn9cbw720i6pm1gingcir15dq8ppbnk6cylnyal";
}; };
}; };