diff options
| author | LluĆs Batlle i Rossell <viric@viric.name> | 2012-07-02 22:27:18 +0200 |
|---|---|---|
| committer | LluĆs Batlle i Rossell <viric@viric.name> | 2012-07-02 22:27:18 +0200 |
| commit | dcdea9d2b8a68b66ed3844fd9adce20d30f4f925 (patch) | |
| tree | 86a6e18be3af19660aee4ee8c208e2e062662c93 /pkgs/applications/graphics/cinepaint | |
| parent | f0e4e770f00401a1522e03a328e7ba5f4ca00574 (diff) | |
cinepaint: updating, and making it build
I wrote a little patch for the cmake files, or it
didn't install.
I also used the NIX_LDFLAGS trick; they are not doing proper linking somehow.
Diffstat (limited to 'pkgs/applications/graphics/cinepaint')
| -rw-r--r-- | pkgs/applications/graphics/cinepaint/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/applications/graphics/cinepaint/install.patch | 24 |
2 files changed, 32 insertions, 4 deletions
diff --git a/pkgs/applications/graphics/cinepaint/default.nix b/pkgs/applications/graphics/cinepaint/default.nix index 2f1af0f89dd..bea04f6dc2c 100644 --- a/pkgs/applications/graphics/cinepaint/default.nix +++ b/pkgs/applications/graphics/cinepaint/default.nix @@ -2,7 +2,7 @@ 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 } : + mesa, libXext, libXpm, libXau, libXxf86vm, pixman, libpthreadstubs, fltk } : stdenv.mkDerivation rec { name = "cinepaint-1.0"; @@ -12,15 +12,19 @@ stdenv.mkDerivation rec { sha256 = "02mbpsykd7sfr9h6c6gxld6i3bdwnsgvm70b5yff01gwi69w2wi7"; }; - buildInputs = [ gtk freetype fontconfig lcms flex libtiff libjpeg libpng + buildInputs = [ libpng gtk freetype fontconfig lcms flex libtiff libjpeg libexif zlib perl libX11 perlXMLParser python pygtk gettext intltool babl gegl glib makedepend xf86vidmodeproto xineramaproto libXmu openexr mesa - libXext libXpm libXxf86vm pixman libpthreadstubs + libXext libXpm libXau libXxf86vm pixman libpthreadstubs fltk ]; + patches = [ ./install.patch ]; + buildNativeInputs = [ cmake pkgconfig ]; - NIX_CFLAGS_COMPILE = "-I."; + NIX_LDFLAGS = "-llcms -ljpeg"; + + # NIX_CFLAGS_COMPILE = "-I."; meta = { homepage = http://www.cinepaint.org/; diff --git a/pkgs/applications/graphics/cinepaint/install.patch b/pkgs/applications/graphics/cinepaint/install.patch new file mode 100644 index 00000000000..f15ff1c4414 --- /dev/null +++ b/pkgs/applications/graphics/cinepaint/install.patch @@ -0,0 +1,24 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index dfb182f..5adaaa5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -138,7 +138,7 @@ STRING(REPLACE "/" "\\/" ESCAPEDPREFIX ${PREFIX}) + # Note that for MacOS this needs to be revised + # for the @OSX_ICC...@ variables + ADD_CUSTOM_COMMAND( +- OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/gimprc ++ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/gimprc + COMMAND sed -e s/\@platform\@//g + -e s/\@prefix\@/${ESCAPEDPREFIX}/g + -e s/\@exec_prefix\@/\${prefix}/g +@@ -155,8 +155,8 @@ ADD_CUSTOM_COMMAND( + + ADD_CUSTOM_TARGET(RCFile ALL echo + "" +- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/user_install +- ${CMAKE_CURRENT_SOURCE_DIR}/gimprc ++ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/user_install ++ ${CMAKE_CURRENT_BINARY_DIR}/gimprc + ) + + |