diff options
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/editors/sigil/default.nix | 71 | ||||
-rw-r--r-- | pkgs/applications/graphics/rawtherapee/default.nix | 25 | ||||
-rw-r--r-- | pkgs/applications/graphics/rawtherapee/sigc++_fix.patch | 52 |
3 files changed, 90 insertions, 58 deletions
diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix index ad6f599a3617..ed72043d7239 100644 --- a/pkgs/applications/editors/sigil/default.nix +++ b/pkgs/applications/editors/sigil/default.nix @@ -1,67 +1,42 @@ -{ stdenv, fetchurl, unzip, cmake, pkgconfig, makeWrapper -, hunspell, minizip, boost, xercesc +{ stdenv, fetchFromGitHub, cmake, pkgconfig, makeWrapper +, boost, xercesc , qtbase, qttools, qtwebkit, qtxmlpatterns +, python3, python3Packages }: -let - version = "0.7.4"; - -in - stdenv.mkDerivation rec { name = "sigil-${version}"; + version = "0.9.6"; - src = fetchurl { - url = "https://sigil.googlecode.com/files/Sigil-${version}-Code.zip"; - sha256 = "68c7ca15ea8611921af0c435369563f55c6afd2ef1fb0945cf6c4a47429b0fb5"; + src = fetchFromGitHub { + sha256 = "0hihd5f3avpdvxwp5j80qdg74zbw7p20y6j9q8cw7wd0bak58h9c"; + rev = version; + repo = "Sigil"; + owner = "Sigil-Ebook"; }; + pythonPath = with python3Packages; [ lxml ]; + + propagatedBuildInputs = with python3Packages; [ lxml ]; + buildInputs = [ - unzip cmake pkgconfig - hunspell minizip boost xercesc qtbase qttools qtwebkit qtxmlpatterns + cmake pkgconfig + boost xercesc qtbase qttools qtwebkit qtxmlpatterns + python3 python3Packages.lxml makeWrapper ]; - # XXX: the compiler seems to treat the .h file inappropriately: - # - # COMMAND ${CMAKE_CXX_COMPILER} ${compile_flags} \ - # ${CMAKE_CURRENT_SOURCE_DIR}/${header_name}.h \ - # -o ${header_name}.h.gch - # - # but using -c or -x c++-header seems to work: - # - # COMMAND ${CMAKE_CXX_COMPILER} ${compile_flags} \ - # -c ${CMAKE_CURRENT_SOURCE_DIR}/${header_name}.h \ - # -o ${header_name}.h.gch - # - # COMMAND ${CMAKE_CXX_COMPILER} ${compile_flags} \ - # -x c++-header ${CMAKE_CURRENT_SOURCE_DIR}/${header_name}.h \ - # -o ${header_name}.h.gch - # - # Might be related to: - # - # http://permalink.gmane.org/gmane.comp.gcc.bugs/361195 - buildCommand = '' - mkdir -pv $out - mkdir -pv ${name}/src ${name}/build ${name}/run - cd ${name}/src - unzip -n ${src} - sed -i \ - -e 's|\(COMMAND\) \([^ ]\+\) \([^ ]\+\) \(.*\)|\1 \2 \3 -c \4|' \ - cmake_extras/CustomPCH.cmake - cd ../build - cmake -G "Unix Makefiles" \ - -DCMAKE_INSTALL_PREFIX=$out \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_BUILD_RPATH=ON \ - ../src - make - make install + preFixup = '' + wrapProgram "$out/bin/sigil" \ + --prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath ${python3Packages.lxml}) ''; + enableParallelBuilding = true; + meta = { description = "Free, open source, multi-platform ebook (ePub) editor"; - homepage = https://code.google.com/p/sigil/; + homepage = https://github.com/Sigil-Ebook/Sigil/; license = stdenv.lib.licenses.gpl3; inherit version; + maintainers = with stdenv.lib.maintainers; [ ramkromberg ]; }; } diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 34ad7821c876..aeb427348ca3 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -1,21 +1,26 @@ -{ stdenv, fetchurl, pkgconfig, gtk, cmake, pixman, libpthreadstubs, gtkmm, libXau -, libXdmcp, lcms2, libiptcdata, libcanberra, fftw, expat +{ stdenv, fetchFromGitHub, pkgconfig, gtk, cmake, pixman, libpthreadstubs, gtkmm, libXau +, libXdmcp, lcms2, libiptcdata, libcanberra, fftw, expat, pcre, libsigcxx , mercurial # Not really needed for anything, but it fails if it does not find 'hg' }: stdenv.mkDerivation rec { - name = "rawtherapee-4.0.10"; + name = "rawtherapee-4.2"; - src = fetchurl { - url = http://rawtherapee.googlecode.com/files/rawtherapee-4.0.10.tar.xz; - sha256 = "1ibsdm2kqpw796rcdihnnp67vx0wm1d1bnlzq269r9p01w5s102g"; + src = fetchFromGitHub { + owner = "Beep6581"; + repo = "RawTherapee"; + rev = "4.2"; + sha256 = "1v4px239vlmk9l8wbzlvlyni4ns12icxmgfz21m86jkd10pj5dgr"; }; buildInputs = [ pkgconfig gtk cmake pixman libpthreadstubs gtkmm libXau libXdmcp - lcms2 libiptcdata mercurial libcanberra fftw expat ]; + lcms2 libiptcdata mercurial libcanberra fftw expat pcre libsigcxx ]; - # Disable the use of the RAWZOR propietary libraries - cmakeFlags = [ "-DWITH_RAWZOR=OFF" ]; + patchPhase = '' + patch -p1 < ${./sigc++_fix.patch} + ''; + + NIX_CFLAGS_COMPILE = "-std=gnu++11 -Wno-deprecated-declarations -Wno-unused-result"; enableParallelBuilding = true; @@ -23,7 +28,7 @@ stdenv.mkDerivation rec { description = "RAW converter and digital photo processing software"; homepage = http://www.rawtherapee.com/; license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [viric jcumming]; + maintainers = with stdenv.lib.maintainers; [viric jcumming mahe]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/graphics/rawtherapee/sigc++_fix.patch b/pkgs/applications/graphics/rawtherapee/sigc++_fix.patch new file mode 100644 index 000000000000..eeeefb733df6 --- /dev/null +++ b/pkgs/applications/graphics/rawtherapee/sigc++_fix.patch @@ -0,0 +1,52 @@ +diff --git a/rtgui/adjuster.cc b/rtgui/adjuster.cc +index f73dd8a..a7a069c 100644 +--- a/rtgui/adjuster.cc ++++ b/rtgui/adjuster.cc +@@ -17,7 +17,7 @@ + * along with RawTherapee. If not, see <http://www.gnu.org/licenses/>. + */ + #include "adjuster.h" +-#include <sigc++/class_slot.h> ++#include <sigc++/slot.h> + #include <cmath> + #include "multilangmgr.h" + #include "../rtengine/rtengine.h" +diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc +index 134c0d7..8ce1808 100644 +--- a/rtgui/preferences.cc ++++ b/rtgui/preferences.cc +@@ -16,7 +16,7 @@ + * You should have received a copy of the GNU General Public License + * along with RawTherapee. If not, see <http://www.gnu.org/licenses/>. + */ +-#include <sigc++/class_slot.h> ++#include <sigc++/slot.h> + #include "preferences.h" + #include "multilangmgr.h" + #include "splash.h" +diff --git a/rtgui/thresholdadjuster.cc b/rtgui/thresholdadjuster.cc +index 6b41329..19cde25 100644 +--- a/rtgui/thresholdadjuster.cc ++++ b/rtgui/thresholdadjuster.cc +@@ -17,7 +17,7 @@ + * along with RawTherapee. If not, see <http://www.gnu.org/licenses/>. + */ + #include "thresholdadjuster.h" +-#include <sigc++/class_slot.h> ++#include <sigc++/slot.h> + #include <cmath> + #include "multilangmgr.h" + #include "../rtengine/rtengine.h" +diff --git a/rtgui/tonecurve.cc b/rtgui/tonecurve.cc +index 2e439e1..5f14200 100644 +--- a/rtgui/tonecurve.cc ++++ b/rtgui/tonecurve.cc +@@ -18,7 +18,7 @@ + */ + #include "tonecurve.h" + #include "adjuster.h" +-#include <sigc++/class_slot.h> ++#include <sigc++/slot.h> + #include <iomanip> + #include "ppversion.h" + #include "edit.h" |