+1 patch (from Gentoo)

svn path=/nixpkgs/trunk/; revision=33094
This commit is contained in:
Yury G. Kudryashov 2012-03-14 23:34:30 +00:00
parent 914a042d7d
commit bd17f891dd

View File

@ -12,7 +12,11 @@ stdenv.mkDerivation rec {
sha256 = "01fd2qb0zddif3wz1a2wdmwyzn81cf73678qp2gjs8iikmdz6w7x"; sha256 = "01fd2qb0zddif3wz1a2wdmwyzn81cf73678qp2gjs8iikmdz6w7x";
}; };
patches = map fetchurl (import ./debian-patches.nix); patches = map fetchurl ((import ./debian-patches.nix) ++
[ {
url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-gfx/k3d/files/k3d-0.7.11.0-libpng14.patch;
sha256 = "1vl7dbvxg9b54ay0n8dd2v2k3j001h8h1bpr1cbm3vrzv31lnwzx";
} ]);
preConfigure = '' preConfigure = ''
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/build/lib" export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/build/lib"
@ -22,7 +26,7 @@ stdenv.mkDerivation rec {
cmake mesa zlib python expat libxml2 libsigcxx libuuid freetype libpng cmake mesa zlib python expat libxml2 libsigcxx libuuid freetype libpng
boost doxygen cairomm pkgconfig imagemagick libjpeg libtiff gettext boost doxygen cairomm pkgconfig imagemagick libjpeg libtiff gettext
intltool perl intltool perl
gtkmm glibmm gtkglext gtkmm glibmm gtkglext
]; ];
doCheck = false; doCheck = false;
@ -32,7 +36,7 @@ stdenv.mkDerivation rec {
homepage = "http://k-3d.org/"; homepage = "http://k-3d.org/";
platforms = with stdenv.lib.platforms; platforms = with stdenv.lib.platforms;
linux; linux;
maintainers = with stdenv.lib.maintainers; maintainers = with stdenv.lib.maintainers;
[raskin]; [raskin];
}; };
} }