From e785aae6e8b2793a615202c4cb57c3341cbecdb8 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 3 Jan 2012 10:32:56 +0000 Subject: Fix most packages depending on fltk I failed to build cinepaint svn path=/nixpkgs/trunk/; revision=31224 --- pkgs/applications/graphics/cinepaint/default.nix | 37 +++++++++--------------- 1 file changed, 14 insertions(+), 23 deletions(-) (limited to 'pkgs/applications/graphics/cinepaint') diff --git a/pkgs/applications/graphics/cinepaint/default.nix b/pkgs/applications/graphics/cinepaint/default.nix index b19ffdb337b6..2f1af0f89dd4 100644 --- a/pkgs/applications/graphics/cinepaint/default.nix +++ b/pkgs/applications/graphics/cinepaint/default.nix @@ -1,41 +1,32 @@ -{ stdenv, fetchcvs, cmake, pkgconfig, gtk, freetype, fontconfig, lcms, fltk, +{ stdenv, fetchurl, cmake, pkgconfig, gtk, freetype, fontconfig, lcms, flex, libtiff, libjpeg, libpng, libexif, zlib, perl, libX11, perlXMLParser, python, pygtk, gettext, intltool, babl, gegl, glib, makedepend, xf86vidmodeproto, xineramaproto, libXmu, openexr, - mesa, libXext, libXpm, libXxf86vm, automake, autoconf, libtool } : + mesa, libXext, libXpm, libXxf86vm, pixman, libpthreadstubs } : -stdenv.mkDerivation { - name = "cinepaint-0.25.0"; +stdenv.mkDerivation rec { + name = "cinepaint-1.0"; - # The developer told me this cvs fetch is 0.25.0 - src = fetchcvs { - cvsRoot = ":pserver:anonymous@cinepaint.cvs.sourceforge.net:/cvsroot/cinepaint"; - module = "cinepaint-project"; - date = "2008-11-06"; - sha256 = "f5ac249628ffe04349d1bb3b1e078be0cda7575dd71d12ae74143baa006acb6d"; + src = fetchurl { + url = "mirror://sourceforge/cinepaint/${name}.tgz"; + sha256 = "02mbpsykd7sfr9h6c6gxld6i3bdwnsgvm70b5yff01gwi69w2wi7"; }; - buildInputs = [ cmake pkgconfig gtk freetype fontconfig lcms fltk flex libtiff - libjpeg libpng libexif zlib perl libX11 perlXMLParser python pygtk gettext - intltool babl gegl glib makedepend xf86vidmodeproto xineramaproto libXmu - openexr mesa libXext libXpm libXxf86vm automake autoconf libtool ]; + buildInputs = [ gtk freetype fontconfig lcms flex libtiff libjpeg libpng + libexif zlib perl libX11 perlXMLParser python pygtk gettext intltool babl + gegl glib makedepend xf86vidmodeproto xineramaproto libXmu openexr mesa + libXext libXpm libXxf86vm pixman libpthreadstubs + ]; - dontUseCmakeConfigure = 1; + buildNativeInputs = [ cmake pkgconfig ]; NIX_CFLAGS_COMPILE = "-I."; - configurePhase = '' - cd cinepaint - chmod 0777 autogen.sh - ./autogen.sh - ./configure --prefix=$out - ''; - meta = { homepage = http://www.cinepaint.org/; license = "free"; description = "Image editor which supports images over 8bpp and ICC profiles"; maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + platforms = stdenv.lib.platforms.linux; }; } -- cgit 1.4.1