ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 04:43:09 +03:00
Code Issues Projects Releases Wiki Activity

Merge ^/nixpkgs/trunk

Browse Source 
svn tried to change libpng/default.nix version, I've changed libpng/12.nix
version manually.

svn path=/nixpkgs/branches/libpng15/; revision=32395
This commit is contained in:
Yury G. Kudryashov 2012-02-19 11:06:00 +00:00
commit 5c6a3faf4e
23 changed files with 156 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/graphics/inkscape/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, perl, perlXMLParser, gtk, libXft
, libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm
, glibmm, libsigcxx, lcms, boost, gettext, makeWrapper, intltool
, gsl, python, pyxml, lxml, poppler }:
, gsl, python, pyxml, lxml, poppler, imagemagick, libwpg }:
stdenv.mkDerivation rec {
name = "inkscape-0.48.2";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "10v7ixdz7f8vgk2wv0m81zli9p0f446cm1f4aqlvni1ndsx44fi2";
};
patches = [ ./configure-python-libs.patch ];
patches = [ ./configure-python-libs.patch ./libpng-1.5.patch ];
propagatedBuildInputs = [
# Python is used at run-time to execute scripts, e.g., those from
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs = [
pkgconfig perl perlXMLParser gtk libXft libpng zlib popt boehmgc
libxml2 libxslt glib gtkmm glibmm libsigcxx lcms boost gettext
makeWrapper intltool gsl poppler
makeWrapper intltool gsl poppler imagemagick libwpg
];
configureFlags = "--with-python";

47
pkgs/applications/graphics/inkscape/libpng-1.5.patch Normal file
View File

@ -0,0 +1,47 @@
Source: upstream revisions 10061 and 10707
--- a/src/sp-image.cpp 2011-02-21 07:59:34 +0000
+++ b/src/sp-image.cpp 2011-02-21 08:57:28 +0000
@@ -387,9 +387,13 @@
#if defined(PNG_iCCP_SUPPORTED)
{
- char* name = 0;
+ png_charp name = 0;
int compression_type = 0;
- char* profile = 0;
+#if (PNG_LIBPNG_VER < 10500)
+ png_charp profile = 0;
+#else
+ png_bytep profile = 0;
+#endif
png_uint_32 proflen = 0;
if ( png_get_iCCP(pngPtr, infoPtr, &name, &compression_type, &profile, &proflen) ) {
// g_message("Found an iCCP chunk named [%s] with %d bytes and comp %d", name, proflen, compression_type);
--- a/src/extension/internal/pdfinput/svg-builder.cpp 2011-10-27 04:55:51 +0000
+++ b/src/extension/internal/pdfinput/svg-builder.cpp 2011-10-29 20:34:00 +0000
@@ -1481,7 +1481,7 @@
return NULL;
}
// Set error handler
- if (setjmp(png_ptr->jmpbuf)) {
+ if (setjmp(png_jmpbuf(png_ptr))) {
png_destroy_write_struct(&png_ptr, &info_ptr);
return NULL;
}
--- a/src/helper/png-write.cpp 2011-08-07 10:53:12 +0000
+++ b/src/helper/png-write.cpp 2011-10-29 20:34:00 +0000
@@ -166,8 +166,8 @@
/* Set error handling. REQUIRED if you aren't supplying your own
* error hadnling functions in the png_create_write_struct() call.
*/
- if (setjmp(png_ptr->jmpbuf)) {
- /* If we get here, we had a problem reading the file */
+ if (setjmp(png_jmpbuf(png_ptr))) {
+ // If we get here, we had a problem reading the file
fclose(fp);
png_destroy_write_struct(&png_ptr, &info_ptr);
return false;

6
pkgs/applications/networking/irc/chatzilla/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, unzip, xulrunner, makeWrapper }:
stdenv.mkDerivation rec {
name = "chatzilla-0.9.87";
name = "chatzilla-0.9.88";
src = fetchurl {
# Obtained from http://chatzilla.rdmsoft.com/xulrunner/.
url = http://chatzilla.rdmsoft.com/xulrunner/download/chatzilla-0.9.87-xr.zip;
sha256 = "1qwbqngrxyip3k2b71adg271sifvrrxcixkyrsy4vmgl5bwdsl4d";
url = "http://chatzilla.rdmsoft.com/xulrunner/download/${name}-xr.zip";
sha256 = "041jpjl7wnbhqm2f8bf2pwp6igjapmy74swac94h54n644wl5nz0";
};
buildInputs = [ unzip makeWrapper ];

11
pkgs/applications/office/gnucash/default.nix
View File

@ -8,15 +8,12 @@
* for a possible solution.
*/
let
name = "gnucash-2.4.8";
in
stdenv.mkDerivation {
inherit name;
stdenv.mkDerivation rec {
name = "gnucash-2.4.10";
src = fetchurl {
url = "mirror://sourceforge/gnucash/${name}.tar.bz2";
sha256 = "06gfgw4sq1b8c9qzinyd3wmcy3i0jyprngr259l0aldv8rvix8aa";
sha256 = "1k76b6hnsmljggxsq5l9w94krfmhx58ij8jcxf72p0ddnlimdrjj";
};
buildInputs = [
@ -44,7 +41,7 @@ stdenv.mkDerivation {
'';
# The following settings fix failures in the test suite. It's not required otherwise.
NIX_LDFLAGS = "-rpath=${guile}/lib";
NIX_LDFLAGS = "-rpath=${guile}/lib -rpath=${glib}/lib";
preCheck = "export GNC_DOT_DIR=$PWD/dot-gnucash";
doCheck = true;

24
pkgs/applications/science/astronomy/xplanet/default.nix
View File

@ -1,27 +1,21 @@
{stdenv, fetchurl, lib, pkgconfig, freetype, pango, libpng, libtiff, giflib, libjpeg}:
{stdenv, fetchurl, pkgconfig, freetype, pango, libpng, libtiff, giflib
, libjpeg, netpbm}:
stdenv.mkDerivation {
name = "xplanet-1.2.1";
stdenv.mkDerivation rec {
name = "xplanet-1.2.2";
src = fetchurl {
url = mirror://sourceforge/xplanet/xplanet-1.2.1.tar.gz;
sha256 = "1pp55a1rgjkfcrwc00y3l48fhpqcp3qagd1zbym6zg27fzi5fbgm";
url = "mirror://sourceforge/xplanet/${name}.tar.gz";
sha256 = "1jnkrly9njkibxqbg5im4pq9cqjzwmki6jzd318dvlfmnicqr3vg";
};
patches =
[ # Build on GCC 4.4.
(fetchurl {
url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/x11-misc/xplanet/files/xplanet-1.2.1-gentoo.patch?rev=1.1";
sha256 = "0mmagjizj4hj057qmpi45w95zlrqda32x96xy44f6126xzj02yd5";
})
];
buildInputs = [ pkgconfig freetype pango libpng libtiff giflib libjpeg ];
buildInputs = [ pkgconfig freetype pango libpng libtiff giflib libjpeg netpbm ];
meta = {
description = "Renders an image of the earth or other planets into the X root window";
homepage = http://xplanet.sourceforge.net;
license = "GPL";
maintainers = [ lib.maintainers.sander ];
maintainers = [ stdenv.lib.maintainers.sander stdenv.lib.maintainers.urkud ];
platforms = stdenv.lib.platforms.all;
};
}

9
pkgs/desktops/kde-4.7/default.nix
View File

@ -1,4 +1,4 @@
{ callPackage, callPackageOrig, stdenv, qt47 }:
{ callPackage, callPackageOrig, stdenv, qt48 }:
let
release = "4.7.4";
@ -44,7 +44,7 @@ kde.modules // kde.individual //
akonadi = callPackage ./support/akonadi { };
qt4 = qt47;
qt4 = qt48;
kdebase_workspace = kde.modules.kde_workspace;
@ -52,5 +52,8 @@ kde.modules // kde.individual //
full = stdenv.lib.attrValues kde.modules;
l10n = callPackage ./l10n { inherit release; };
l10n = callPackage ./l10n {
inherit release;
inherit (kde.manifest) stable;
};
}

17
pkgs/desktops/kde-4.7/files/kde-wallpapers-buildsystem.patch Normal file
View File

@ -0,0 +1,17 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d3e247..f78db67 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,10 @@
-find_package(KDE4 REQUIRED)
-include(KDE4Defaults)
+project(kde-wallpapers NONE)
+if( WALLPAPER_INSTALL_DIR )
+ message(STATUS "Installing wallpapers to user-supplied directory ${WALLPAPER_INSTALL_DIR}")
+else()
+ find_package(KDE4 REQUIRED)
+ include(KDE4Defaults)
+endif()
install(DIRECTORY Air DESTINATION ${WALLPAPER_INSTALL_DIR} PATTERN .svn EXCLUDE)

7
pkgs/desktops/kde-4.7/kde-wallpapers.nix
View File

@ -1,8 +1,11 @@
{ kde, kdelibs }:
{ kde, cmake }:
kde {
buildNativeInputs = [ cmake ];
buildInputs = [ kdelibs ];
patches = [ ./files/kde-wallpapers-buildsystem.patch ];
cmakeFlags = "-DWALLPAPER_INSTALL_DIR=share/wallpapers";
outputHashAlgo = "sha256";
outputHashMode = "recursive";

6
pkgs/desktops/kde-4.7/kde-workspace.nix
View File

@ -1,13 +1,13 @@
{ kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, shared_desktop_ontologies,
lm_sensors, pciutils, libraw1394, libusb, libxklavier, python, libqalculate,
consolekit, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi,
pykde4
pykde4, libjpeg, pkgconfig, libXft, libXxf86misc
}:
kde {
buildInputs =
[ kdelibs qimageblitz libdbusmenu_qt pykde4
[ kdelibs qimageblitz libdbusmenu_qt pykde4 libjpeg libXft libXxf86misc
xorg.libxkbfile xorg.libXcomposite xorg.libXScrnSaver xorg.libXtst
xorg.libXcomposite xorg.libXdamage xorg.libXau xorg.libXdmcp
xorg.libpthreadstubs
@ -15,6 +15,8 @@ kde {
libusb python libqalculate consolekit kdepimlibs pam prison akonadi
];
buildNativeInputs = [ pkgconfig ];
preConfigure =
''
# Fix incorrect path to kde4-config.

4
pkgs/desktops/kde-4.7/kdeaccessibility/kmousetool.nix
View File

@ -1,7 +1,7 @@
{ kde, kdelibs, libXtst }:
{ kde, kdelibs, libXtst, libXt }:
kde {
buildInputs = [ kdelibs libXtst ];
buildInputs = [ kdelibs libXtst libXt ];
meta = {
description = "A program that clicks the mouse for you";

6
pkgs/desktops/kde-4.7/kdeartwork/kscreensaver.nix
View File

@ -1,7 +1,9 @@
{ kde, kdelibs, xscreensaver, kde_workspace, eigen, libkexiv2 }:
{ kde, kdelibs, xscreensaver, kde_workspace, eigen, libkexiv2, libXt, pkgconfig }:
kde {
buildInputs = [ kdelibs xscreensaver kde_workspace eigen libkexiv2 ];
buildInputs = [ kdelibs xscreensaver kde_workspace eigen libkexiv2 libXt ];
buildNativeInputs = [ pkgconfig ];
preConfigure = "cp -v ${./FindXscreensaver.cmake} cmake/modules/FindXscreensaver.cmake";

6
pkgs/desktops/kde-4.7/kdegames.nix
View File

@ -1,12 +1,14 @@
{ kde, kdelibs, qca2, twisted, pythonPackages, sip, makeWrapper, pykde4,
openal, libsndfile, qhull }:
openal, libsndfile, qhull, sqlite, pkgconfig }:
kde rec {
buildInputs = [ kdelibs qca2 pythonPackages.python pythonPackages.wrapPython
openal libsndfile qhull ] ++ pythonPath;
openal libsndfile qhull sqlite ] ++ pythonPath;
pythonPath = [ pythonPackages.twisted pykde4 ];
buildNativeInputs = [ pkgconfig ];
# TODO: ggz
postInstall = "wrapPythonPrograms";

7
pkgs/desktops/kde-4.7/kdegraphics/gwenview.nix
View File

@ -1,9 +1,12 @@
{ kde, kdelibs, exiv2, shared_desktop_ontologies, kde_baseapps, libkipi }:
{ kde, kdelibs, exiv2, shared_desktop_ontologies, kde_baseapps, libkipi
, libjpeg, pkgconfig }:
kde {
buildInputs =
[ kdelibs exiv2 shared_desktop_ontologies kde_baseapps libkipi ];
[ kdelibs exiv2 shared_desktop_ontologies kde_baseapps libkipi libjpeg ];
buildNativeInputs = [ pkgconfig ];
meta = {
description = "Gwenview, the KDE image viewer";

2
pkgs/desktops/kde-4.7/kdelibs.nix
View File

@ -11,7 +11,7 @@ kde {
[
acl attr attica avahi bzip2 enchant fam getopt giflib herqq jasper
libdbusmenu_qt libXScrnSaver libxslt pcre polkit_qt_1 qca2
shared_desktop_ontologies udev xz libxml2 libjpeg
shared_desktop_ontologies udev xz libxml2 libjpeg kerberos
];
propagatedBuildInputs = [ qt4 soprano strigi phonon ];

5
pkgs/desktops/kde-4.7/kdemultimedia.nix
View File

@ -1,5 +1,5 @@
{ kde, alsaLib, libvorbis, taglib, flac, cdparanoia, lame, kdelibs, ffmpeg,
libmusicbrainz3, libtunepimp }:
libmusicbrainz3, libtunepimp, pulseaudio }:
kde {
@ -7,7 +7,8 @@ kde {
# Note: kdemultimedia can use xine-lib, but it doesn't seem useful
# without the Phonon Xine backend.
[ kdelibs cdparanoia taglib libvorbis libmusicbrainz3 libtunepimp ffmpeg
flac lame ];
flac lame pulseaudio
];
meta = {
description = "KDE multimedia programs such as a movie player and volume utility";

6
pkgs/desktops/kde-4.7/kdenetwork/kget.nix
View File

@ -1,10 +1,10 @@
{ kde, kdelibs, libktorrent, kde_workspace, kdepimlibs,
shared_desktop_ontologies, kde_baseapps, gpgme, boost, libmms, qca2 }:
{ kde, kdelibs, libktorrent, kde_workspace, kdepimlibs, sqlite
, shared_desktop_ontologies, kde_baseapps, gpgme, boost, libmms, qca2 }:
kde {
buildInputs =
[ kdelibs libktorrent kde_workspace shared_desktop_ontologies kdepimlibs
kde_baseapps gpgme boost libmms qca2
kde_baseapps gpgme boost libmms qca2 sqlite
];
KDEDIRS = libktorrent;

4
pkgs/desktops/kde-4.7/kdenetwork/kopete.nix
View File

@ -1,11 +1,11 @@
{ kde, kdelibs, speex, libmsn, libotr, kdepimlibs, qimageblitz, libktorrent,
jasper, libidn, mediastreamer, msilbc, pkgconfig, libxml2, libxslt, giflib,
libgadu, boost, qca2, gpgme }:
libgadu, boost, qca2, gpgme, sqlite }:
kde {
buildInputs = [ kdelibs speex libmsn libotr kdepimlibs qimageblitz libktorrent
jasper libidn mediastreamer msilbc libxml2 libxslt giflib libgadu boost qca2
gpgme ];
gpgme sqlite ];
buildNativeInputs = [ pkgconfig ];

4
pkgs/desktops/kde-4.7/kdenetwork/krdc.nix
View File

@ -1,7 +1,7 @@
{ kde, kdelibs, libvncserver }:
{ kde, kdelibs, libvncserver, libjpeg }:
kde {
buildInputs = [ kdelibs libvncserver ];
buildInputs = [ kdelibs libvncserver libjpeg ];
patches = [ ./kdenetwork.patch ];
}

4
pkgs/desktops/kde-4.7/l10n/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, kdelibs, gettext, release }:
{ stdenv, fetchurl, kdelibs, gettext, release, stable }:
let
@ -11,7 +11,7 @@ let
name = "kde-l10n-${saneName}-${release}";
src = fetchurl {
url = "mirror://kde/stable/${release}/src/kde-l10n/kde-l10n-${lang}-${release}.tar.bz2";
url = "mirror://kde/${if stable then "" else "un"}stable/${release}/src/kde-l10n/kde-l10n-${lang}-${release}.tar.bz2";
name = "${name}.tar.bz2";
inherit sha256;
};

24
pkgs/development/libraries/bullet/default.nix Normal file
View File

@ -0,0 +1,24 @@
{stdenv, fetchurl, unzip, cmake}:
stdenv.mkDerivation {
name = "bullet-2.78";
src = fetchurl {
url = "http://bullet.googlecode.com/files/bullet-2.78.zip";
sha256 = "10l2dclvv0di9mi9qp6xfy9vybx182xp2dyygabacrpr3p75s77k";
};
buildInputs = [ unzip cmake ];
configurePhase = ''
cmake -DBUILD_SHARED_LIBS=ON -DBUILD_EXTRAS=OFF -DBUILD_DEMOS=OFF .
'';
meta = {
description = "A professional free 3D Game Multiphysics Library";
longDescription = ''
Bullet 3D Game Multiphysics Library provides state of the art collision
detection, soft body and rigid body dynamics.
'';
homepage = http://code.google.com/p/bullet/;
license = stdenv.lib.licenses.zlib;
maintainers = [ "Alexander Foremny <alexanderforemny@googlemail.com>" ];
};
}

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ruby, qt4, pkgconfig, libsamplerate, fftwSinglePrec }:
{ stdenv, fetchurl, ruby, qt4, pkgconfig, libsamplerate, fftwSinglePrec, which }:
let version = "0.3.3"; in
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
prefixKey = "--prefix ";
propagatedBuildInputs = [ qt4 libsamplerate fftwSinglePrec ];
buildNativeInputs = [ ruby pkgconfig ];
buildNativeInputs = [ ruby pkgconfig which ];
configureFlags = "--release";

4
pkgs/development/libraries/libpng/12.nix
View File

@ -3,11 +3,11 @@
assert zlib != null;
stdenv.mkDerivation rec {
name = "libpng-1.2.46";
name = "libpng-1.2.47";
src = fetchurl {
url = "mirror://sourceforge/libpng/${name}.tar.xz";
sha256 = "0rcx4v4khdkrvz7b02fmx7lab2pk1lal4dhx9widv36b7g2xvwzn";
sha256 = "1lai3dnzw81y40jr17bdj1qh08hwv9mc1v74yybl7jdx2hiilsvx";
};
propagatedBuildInputs = [ zlib ];

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

@ -8793,4 +8793,6 @@ let
misc = import ../misc/misc.nix { inherit pkgs stdenv; };
bullet = callPackage ../development/libraries/bullet {};
}; in pkgs