diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-09-19 05:16:32 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-09-19 05:16:32 +0000 |
| commit | fa506acf29f9a6accb72c9a51df220b8d0b08d37 (patch) | |
| tree | 270240c671e549c6f6f5a2b69eecbbe3366a294b /pkgs/applications/graphics/comical | |
| parent | ef664e90a081d0ac66fe0f43007de53a60e3f812 (diff) | |
| download | nixpkgs-fa506acf29f9a6accb72c9a51df220b8d0b08d37.tar nixpkgs-fa506acf29f9a6accb72c9a51df220b8d0b08d37.tar.gz nixpkgs-fa506acf29f9a6accb72c9a51df220b8d0b08d37.tar.bz2 nixpkgs-fa506acf29f9a6accb72c9a51df220b8d0b08d37.tar.lz nixpkgs-fa506acf29f9a6accb72c9a51df220b8d0b08d37.tar.xz nixpkgs-fa506acf29f9a6accb72c9a51df220b8d0b08d37.tar.zst nixpkgs-fa506acf29f9a6accb72c9a51df220b8d0b08d37.zip | |
comical: build with wxGTK28
svn path=/nixpkgs/trunk/; revision=29339
Diffstat (limited to 'pkgs/applications/graphics/comical')
| -rw-r--r-- | pkgs/applications/graphics/comical/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/applications/graphics/comical/wxgtk-2.8.patch | 36 |
2 files changed, 42 insertions, 8 deletions
diff --git a/pkgs/applications/graphics/comical/default.nix b/pkgs/applications/graphics/comical/default.nix index 4cce7fde4e0..68910e67e25 100644 --- a/pkgs/applications/graphics/comical/default.nix +++ b/pkgs/applications/graphics/comical/default.nix @@ -1,19 +1,17 @@ {stdenv, fetchurl, wxGTK, utillinux, zlib }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "comical-0.8"; src = fetchurl { - url = mirror://sourceforge/comical/comical-0.8.tar.gz; + url = "mirror://sourceforge/comical/${name}.tar.gz"; sha256 = "0b6527cc06b25a937041f1eb248d0fd881cf055362097036b939817f785ab85e"; }; buildInputs = [ wxGTK utillinux zlib ]; - patchPhase = '' - sed -i -e 's@"zlib\\.h"@<zlib.h>@' unzip/unzip.h - sed -i -e 's@/usr/local@'$out@ \ - -e 's@-lminiunzip@-lminiunzip -lz@' Makefile - ''; + preBuild="makeFlags=\"prefix=$out\""; - installPhase = "mkdir -p $out/bin ; make install"; + patches = [ ./wxgtk-2.8.patch ]; + + preInstall = "mkdir -pv $out/bin"; meta = { description = "Viewer of CBR and CBZ files, often used to store scanned comics"; diff --git a/pkgs/applications/graphics/comical/wxgtk-2.8.patch b/pkgs/applications/graphics/comical/wxgtk-2.8.patch new file mode 100644 index 00000000000..db7626074a0 --- /dev/null +++ b/pkgs/applications/graphics/comical/wxgtk-2.8.patch @@ -0,0 +1,36 @@ +diff --git a/Makefile b/Makefile +index a648e72..181c47f 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,5 +1,5 @@ + CC = `wx-config --cxx` +-LDFLAGS = `wx-config --libs` -Lunrar -lunrar -Lunzip -lminiunzip ++LDFLAGS = `wx-config --libs` -Lunrar -lunrar -Lunzip -lminiunzip -lz + INSTALL = install + INSTALL_PROGRAM = $(INSTALL) + prefix = /usr/local +diff --git a/src/ComicalApp.cpp b/src/ComicalApp.cpp +index 0c004cd..667e75e 100644 +--- a/src/ComicalApp.cpp ++++ b/src/ComicalApp.cpp +@@ -28,6 +28,7 @@ + #include "ComicalApp.h" + #include "ComicalFrame.h" + #include <wx/log.h> ++#include <wx/icon.h> + + #if !defined(__WXMAC__) && !defined(__WXCOCOA__) && !defined(__WXMSW__) && !defined(__WXPM__) + #include "../Comical Icons/comical.xpm" +diff --git a/unzip/unzip.h b/unzip/unzip.h +index b247937..5bb6a69 100644 +--- a/unzip/unzip.h ++++ b/unzip/unzip.h +@@ -50,7 +50,7 @@ extern "C" { + #endif + + #ifndef _ZLIB_H +-#include "zlib.h" ++#include <zlib.h> + #endif + + #ifndef _ZLIBIOAPI_H |