pyrox.dev
rawtherapee: 4.0 -> 4.2
+15
-10
pkgs/applications/graphics/rawtherapee/default.nix
+15
-10
pkgs/applications/graphics/rawtherapee/default.nix
···
1
-
{ stdenv, fetchurl, pkgconfig, gtk, cmake, pixman, libpthreadstubs, gtkmm, libXau
2
-
, libXdmcp, lcms2, libiptcdata, libcanberra, fftw, expat
1
+
{ stdenv, fetchFromGitHub, pkgconfig, gtk, cmake, pixman, libpthreadstubs, gtkmm, libXau
2
+
, libXdmcp, lcms2, libiptcdata, libcanberra, fftw, expat, pcre, libsigcxx
3
3
, mercurial # Not really needed for anything, but it fails if it does not find 'hg'
4
4
}:
5
5
6
6
stdenv.mkDerivation rec {
7
-
name = "rawtherapee-4.0.10";
7
+
name = "rawtherapee-4.2";
8
8
9
-
src = fetchurl {
10
-
url = http://rawtherapee.googlecode.com/files/rawtherapee-4.0.10.tar.xz;
11
-
sha256 = "1ibsdm2kqpw796rcdihnnp67vx0wm1d1bnlzq269r9p01w5s102g";
9
+
src = fetchFromGitHub {
10
+
owner = "Beep6581";
11
+
repo = "RawTherapee";
12
+
rev = "4.2";
13
+
sha256 = "1v4px239vlmk9l8wbzlvlyni4ns12icxmgfz21m86jkd10pj5dgr";
12
14
};
13
15
14
16
buildInputs = [ pkgconfig gtk cmake pixman libpthreadstubs gtkmm libXau libXdmcp
15
-
lcms2 libiptcdata mercurial libcanberra fftw expat ];
17
+
lcms2 libiptcdata mercurial libcanberra fftw expat pcre libsigcxx ];
16
18
17
-
# Disable the use of the RAWZOR propietary libraries
18
-
cmakeFlags = [ "-DWITH_RAWZOR=OFF" ];
19
+
patchPhase = ''
20
+
patch -p1 < ${./sigc++_fix.patch}
21
+
'';
22
+
23
+
NIX_CFLAGS_COMPILE = "-std=gnu++11 -Wno-deprecated-declarations -Wno-unused-result";
19
24
20
25
enableParallelBuilding = true;
21
26
···
23
28
description = "RAW converter and digital photo processing software";
24
29
homepage = http://www.rawtherapee.com/;
25
30
license = stdenv.lib.licenses.gpl3Plus;
26
-
maintainers = with stdenv.lib.maintainers; [viric jcumming];
31
+
maintainers = with stdenv.lib.maintainers; [viric jcumming mahe];
27
32
platforms = with stdenv.lib.platforms; linux;
28
33
};
29
34
}
+52
pkgs/applications/graphics/rawtherapee/sigc++_fix.patch
+52
pkgs/applications/graphics/rawtherapee/sigc++_fix.patch
···
1
+
diff --git a/rtgui/adjuster.cc b/rtgui/adjuster.cc
2
+
index f73dd8a..a7a069c 100644
3
+
--- a/rtgui/adjuster.cc
4
+
+++ b/rtgui/adjuster.cc
5
+
@@ -17,7 +17,7 @@
6
+
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
7
+
*/
8
+
#include "adjuster.h"
9
+
-#include <sigc++/class_slot.h>
10
+
+#include <sigc++/slot.h>
11
+
#include <cmath>
12
+
#include "multilangmgr.h"
13
+
#include "../rtengine/rtengine.h"
14
+
diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc
15
+
index 134c0d7..8ce1808 100644
16
+
--- a/rtgui/preferences.cc
17
+
+++ b/rtgui/preferences.cc
18
+
@@ -16,7 +16,7 @@
19
+
* You should have received a copy of the GNU General Public License
20
+
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
21
+
*/
22
+
-#include <sigc++/class_slot.h>
23
+
+#include <sigc++/slot.h>
24
+
#include "preferences.h"
25
+
#include "multilangmgr.h"
26
+
#include "splash.h"
27
+
diff --git a/rtgui/thresholdadjuster.cc b/rtgui/thresholdadjuster.cc
28
+
index 6b41329..19cde25 100644
29
+
--- a/rtgui/thresholdadjuster.cc
30
+
+++ b/rtgui/thresholdadjuster.cc
31
+
@@ -17,7 +17,7 @@
32
+
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
33
+
*/
34
+
#include "thresholdadjuster.h"
35
+
-#include <sigc++/class_slot.h>
36
+
+#include <sigc++/slot.h>
37
+
#include <cmath>
38
+
#include "multilangmgr.h"
39
+
#include "../rtengine/rtengine.h"
40
+
diff --git a/rtgui/tonecurve.cc b/rtgui/tonecurve.cc
41
+
index 2e439e1..5f14200 100644
42
+
--- a/rtgui/tonecurve.cc
43
+
+++ b/rtgui/tonecurve.cc
44
+
@@ -18,7 +18,7 @@
45
+
*/
46
+
#include "tonecurve.h"
47
+
#include "adjuster.h"
48
+
-#include <sigc++/class_slot.h>
49
+
+#include <sigc++/slot.h>
50
+
#include <iomanip>
51
+
#include "ppversion.h"
52
+
#include "edit.h"