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

* Added git.

Browse Source 
* Backed out the curl change for now.

svn path=/nixpkgs/trunk/; revision=8612
This commit is contained in:
Eelco Dolstra 2007-04-26 16:14:01 +00:00
parent f95b22c621
commit adcb2909f7
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/applications/version-management/git/default.nix Normal file
View File

@ -0,0 +1,16 @@
{stdenv, fetchurl, curl, openssl, zlib, expat, perl}:
stdenv.mkDerivation {
name = "git-1.5.1.2";
src = fetchurl {
url = http://www.kernel.org/pub/software/scm/git/git-1.5.1.2.tar.bz2;
sha256 = "0a7nnw9631h6nxk7sny0cjv89qlibilvsm6947620vr2kgc6p6k2";
};
buildInputs = [curl openssl zlib expat];
preBuild = "
makeFlagsArray=(prefix=$out PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.bash}/bin/sh)
";
}

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

@ -484,10 +484,10 @@ rec {
inherit (xlibs) libX11 libXext;
};
realCurl = useFromStdenv (stdenv ? curl) stdenv.curl (import ../tools/networking/curl {
realCurl = import ../tools/networking/curl {
inherit fetchurl stdenv zlib;
zlibSupport = !stdenv ? isDietLibC;
});
};
rpm = import ../tools/package-management/rpm {
inherit fetchurl stdenv cpio zlib bzip2 file sqlite beecrypt neon elfutils;
@ -2632,6 +2632,10 @@ rec {
inherit (gnome) gtk libgtkhtml glib pango atk libart_lgpl;
};
git = import ../applications/version-management/git {
inherit fetchurl stdenv curl openssl zlib expat perl;
};
gnash = import ../applications/video/gnash {
inherit fetchurl stdenv SDL SDL_mixer GStreamer
libogg libxml2 libjpeg mesa libpng;