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

cinepaint: updating, and making it build

Browse Source 
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.
This commit is contained in:
Lluís Batlle i Rossell 2012-07-02 22:27:18 +02:00
parent f0e4e770f0
commit dcdea9d2b8
3 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/graphics/cinepaint/default.nix
View File

@ -2,7 +2,7 @@
flex, libtiff, libjpeg, libpng, libexif, zlib, perl, libX11, flex, libtiff, libjpeg, libpng, libexif, zlib, perl, libX11,
perlXMLParser, python, pygtk, gettext, intltool, babl, gegl, perlXMLParser, python, pygtk, gettext, intltool, babl, gegl,
glib, makedepend, xf86vidmodeproto, xineramaproto, libXmu, openexr, glib, makedepend, xf86vidmodeproto, xineramaproto, libXmu, openexr,
mesa, libXext, libXpm, libXxf86vm, pixman, libpthreadstubs } : mesa, libXext, libXpm, libXau, libXxf86vm, pixman, libpthreadstubs, fltk } :
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "cinepaint-1.0"; name = "cinepaint-1.0";
@ -12,15 +12,19 @@ stdenv.mkDerivation rec {
sha256 = "02mbpsykd7sfr9h6c6gxld6i3bdwnsgvm70b5yff01gwi69w2wi7"; 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 libexif zlib perl libX11 perlXMLParser python pygtk gettext intltool babl
gegl glib makedepend xf86vidmodeproto xineramaproto libXmu openexr mesa 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 ]; buildNativeInputs = [ cmake pkgconfig ];
NIX_CFLAGS_COMPILE = "-I."; NIX_LDFLAGS = "-llcms -ljpeg";
# NIX_CFLAGS_COMPILE = "-I.";
meta = { meta = {
homepage = http://www.cinepaint.org/; homepage = http://www.cinepaint.org/;

24
pkgs/applications/graphics/cinepaint/install.patch Normal file
View File

@ -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
)

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

@ -6402,7 +6402,10 @@ let
compiz_plugins_extra = callPackage ../applications/window-managers/compiz/plugins-extra.nix { }; compiz_plugins_extra = callPackage ../applications/window-managers/compiz/plugins-extra.nix { };
cinepaint = callPackage ../applications/graphics/cinepaint { }; cinepaint = callPackage ../applications/graphics/cinepaint {
fltk = fltk13;
libpng = libpng12;
};
codeville = builderDefsPackage (import ../applications/version-management/codeville/0.8.0.nix) { codeville = builderDefsPackage (import ../applications/version-management/codeville/0.8.0.nix) {
inherit makeWrapper; inherit makeWrapper;