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

Merge nixpkgs/trunk

Browse Source 
svn path=/nixpkgs/branches/libpng15/; revision=29488
This commit is contained in:
Yury G. Kudryashov 2011-09-26 00:17:18 +00:00
commit a9da9ae89d
10 changed files with 78 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/SDL_image/default.nix
View File

@ -35,5 +35,7 @@ stdenv.mkDerivation rec {
meta = {
description = "SDL image library";
homepage = http://www.libsdl.org/projects/SDL_image/;
platforms = stdenv.lib.platforms.all;
};
}

61
pkgs/development/libraries/allegro/5.nix Normal file
View File

@ -0,0 +1,61 @@
x@{builderDefsPackage
, texinfo, libXext, xextproto, libX11, xproto, libXpm, libXt, libXcursor
, alsaLib, cmake, zlib, libpng, libvorbis, libXxf86dga, libXxf86misc
, xf86dgaproto, xf86miscproto, xf86vidmodeproto, libXxf86vm, openal, mesa
, kbproto
, ...}:
builderDefsPackage
(a :
let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[];
buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="allegro";
version="5.0.4";
name="${baseName}-${version}";
project="alleg";
url="mirror://sourceforge/project/${project}/${baseName}/${version}/${name}.tar.gz";
hash="0vm93kqvvw4rw2zx4l64c2i86xl5giwbqbyki4b2b83z0acpmc1n";
};
in
rec {
src = a.fetchurl {
url = sourceInfo.url;
sha256 = sourceInfo.hash;
};
inherit (sourceInfo) name version;
inherit buildInputs;
/* doConfigure should be removed if not needed */
phaseNames = ["doCmake" "doMakeInstall"];
doCmake = a.fullDepEntry (''
export NIX_LDFLAGS="$NIX_LDFLAGS -lXext -lX11 -lXpm -lXcursor -lXxf86vm"
cmake -D CMAKE_INSTALL_PREFIX=$out -D CMAKE_SKIP_RPATH=ON .
'') ["minInit" "doUnpack" "addInputs"];
makeFlags = [
];
meta = {
description = "A game programming library";
license = "free-noncopyleft"; # giftware
maintainers = with a.lib.maintainers;
[
raskin
];
platforms = with a.lib.platforms;
linux;
};
passthru = {
updateInfo = {
downloadPage = "http://sourceforge.net/projects/alleg/files/";
};
};
}) x

2
pkgs/development/libraries/allegro/default.nix
View File

@ -16,7 +16,7 @@ let
version="4.4.2";
name="${baseName}-${version}";
project="alleg";
url="mirror://sourceforge/project/${project}/${name}.tar.gz";
url="mirror://sourceforge/project/${project}/${baseName}/${version}/${name}.tar.gz";
hash="1p0ghkmpc4kwij1z9rzxfv7adnpy4ayi0ifahlns1bdzgmbyf88v";
};
in

4
pkgs/development/libraries/haskell/numeric-prelude/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "numeric-prelude";
version = "0.2.2";
sha256 = "bc6adb8c2f04e0e1f62e183e052974700143dc93b1a3cbafe3562aa1f7a649fd";
version = "0.2.2.1";
sha256 = "12b2h103f43rlrfk3zck6mzbvw6v4jf8g4kxz1k14v201lrvb2da";
isLibrary = true;
isExecutable = true;
buildDepends = [

25
pkgs/development/tools/misc/kcachegrind/default.nix
View File

@ -1,25 +0,0 @@
{stdenv, fetchurl, kdelibs, libX11, libXext, libSM, libpng, libjpeg, qt, zlib, perl, expat}:
# !!! dot is a run-time dependencies
stdenv.mkDerivation {
name = "kcachegrind-0.4.6";
src = fetchurl {
url = http://kcachegrind.sourceforge.net/kcachegrind-0.4.6.tar.gz;
md5 = "4ed60028dcefd6bf626635d5f2f50273";
};
KDEDIR = kdelibs;
configureFlags = "
--without-arts
--x-includes=${libX11}/include
--x-libraries=${libX11}/lib";
buildInputs = [kdelibs libX11 libXext libSM zlib perl qt expat libpng libjpeg];
meta = {
description = "Interactive visualisation tool for Valgrind profiling data";
};
}

2
pkgs/tools/networking/fdm/default.nix
View File

@ -33,7 +33,7 @@ rec {
sed -i */Makefile -i Makefile -e 's@ -o root @ @'
sed -i GNUmakefile -e 's@ -g $(BIN_OWNER) @ @'
sed -i GNUmakefile -e 's@ -o $(BIN_GROUP) @ @'
sed -i */Makefile -i Makefile -e 's@-I-@@g'
sed -i */Makefile -i Makefile -i GNUmakefile -e 's@-I-@@g'
'') ["minInit" "doUnpack"];
meta = {

2
pkgs/tools/networking/p2p/bit-tornado/default.nix
View File

@ -1,7 +1,7 @@
{stdenv,fetchurl,python, wxPython, makeWrapper,
ssl}:
stdenv.mkDerivation {
name = "bit-tornado";
name = "bit-tornado-0.3.18";
src = fetchurl {
url = http://download2.bittornado.com/download/BitTornado-0.3.18.tar.gz;

20
pkgs/tools/video/rtmpdump/default.nix
View File

@ -1,21 +1,19 @@
{stdenv, fetchurl, zlib, gnutls, libgcrypt}:
{stdenv, fetchgit, zlib, gnutls, libgcrypt}:
stdenv.mkDerivation {
name = "rtmpdump-2.2d";
src = fetchurl {
url = http://rtmpdump.mplayerhq.hu/download/rtmpdump-2.2d.tgz;
sha256 = "0w2cr3mgp4dcabmr7d7pnsn8f2r1zvar553vfavnzqv61gnhyrm5";
name = "rtmpdump-2.4";
src = fetchgit {
url = git://git.ffmpeg.org/rtmpdump;
rev = "c28f1bab7822de97353849e7787b59e50bbb1428";
sha256 = "927e7ea7a686adb7cbce9d0a0c710de1e0921bbb1f0c1b35d17bdb816e6c73d8";
};
buildInputs = [ zlib gnutls libgcrypt ];
makeFlags = "CRYPTO=GNUTLS posix";
makeFlags = "CRYPTO=GNUTLS";
installPhase = ''
ensureDir $out/bin $out/share/man/man{1,8}
cp rtmpdump rtmpsrv rtmpsuck rtmpgw $out/bin
cp *.1 $out/share/man/man1
cp *.8 $out/share/man/man8
configurePhase = ''
sed -i s,/usr/local,$out, Makefile librtmp/Makefile
'';
meta = {

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

@ -3027,6 +3027,7 @@ let
agg = callPackage ../development/libraries/agg { };
allegro = callPackage ../development/libraries/allegro {};
allegro5 = callPackage ../development/libraries/allegro/5.nix {};
amrnb = callPackage ../development/libraries/amrnb { };
@ -7878,11 +7879,6 @@ let
qt = qt3;
};
kcachegrind = callPackage ../development/tools/misc/kcachegrind {
inherit (kde3) kdelibs;
qt = qt3;
};
};
kde4 = recurseIntoAttrs pkgs.kde45;

1
pkgs/top-level/release.nix
View File

@ -440,7 +440,6 @@ with (import ./release-lib.nix);
kdebase = linux;
kdelibs = linux;
k3b = linux;
kcachegrind = linux;
kile = linux;
};