diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-14 23:34:30 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-14 23:34:30 +0000 |
| commit | bd17f891dda712a6a65787afa69da57dfaf635c2 (patch) | |
| tree | ee0cf949c8f2bce914e17c40ba22e2031fd488cd /pkgs/applications/graphics | |
| parent | 914a042d7da834bbb8f51786b43dd729fc62bd93 (diff) | |
| download | nixlib-bd17f891dda712a6a65787afa69da57dfaf635c2.tar nixlib-bd17f891dda712a6a65787afa69da57dfaf635c2.tar.gz nixlib-bd17f891dda712a6a65787afa69da57dfaf635c2.tar.bz2 nixlib-bd17f891dda712a6a65787afa69da57dfaf635c2.tar.lz nixlib-bd17f891dda712a6a65787afa69da57dfaf635c2.tar.xz nixlib-bd17f891dda712a6a65787afa69da57dfaf635c2.tar.zst nixlib-bd17f891dda712a6a65787afa69da57dfaf635c2.zip | |
+1 patch (from Gentoo)
svn path=/nixpkgs/trunk/; revision=33094
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/k3d/default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix index b9cec29b1f23..058d0f79a2f4 100644 --- a/pkgs/applications/graphics/k3d/default.nix +++ b/pkgs/applications/graphics/k3d/default.nix @@ -12,7 +12,11 @@ stdenv.mkDerivation rec { 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 = '' 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 boost doxygen cairomm pkgconfig imagemagick libjpeg libtiff gettext intltool perl - gtkmm glibmm gtkglext + gtkmm glibmm gtkglext ]; doCheck = false; @@ -32,7 +36,7 @@ stdenv.mkDerivation rec { homepage = "http://k-3d.org/"; platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; + maintainers = with stdenv.lib.maintainers; [raskin]; }; } |