nufraw: fix build
Sources would include glib-headers from within an extern-C scope. Since glib-headers contained templates, this would fail. Add a patch to move the header includes outside of the extern-C scope.
This commit is contained in:
parent
42e9a2ccfa
commit
5e903ee079
@ -54,6 +54,10 @@ stdenv.mkDerivation rec {
|
||||
substituteAll ${./nufraw.thumbnailer} $out/share/thumbnailers/${pname}.thumbnailer
|
||||
'';
|
||||
|
||||
# Fixes an upstream issue where headers with templates were included in an extern-C scope
|
||||
# which caused the build to fail
|
||||
patches = [ ./move-extern-c.patch ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://nufraw.sourceforge.io/";
|
||||
description = "Utility to read and manipulate raw images from digital cameras";
|
||||
|
21
pkgs/applications/graphics/nufraw/move-extern-c.patch
Normal file
21
pkgs/applications/graphics/nufraw/move-extern-c.patch
Normal file
@ -0,0 +1,21 @@
|
||||
diff --git a/uf_glib.h b/uf_glib.h
|
||||
index c1a17bd..8a10800 100644
|
||||
--- a/uf_glib.h
|
||||
+++ b/uf_glib.h
|
||||
@@ -13,13 +13,13 @@
|
||||
#ifndef _UF_GLIB_H
|
||||
#define _UF_GLIB_H
|
||||
|
||||
+#include <glib.h>
|
||||
+#include <glib/gstdio.h>
|
||||
+
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
-#include <glib.h>
|
||||
-#include <glib/gstdio.h>
|
||||
-
|
||||
// g_win32_locale_filename_from_utf8 is needed only on win32
|
||||
#ifdef _WIN32
|
||||
#define uf_win32_locale_filename_from_utf8(__some_string__) \
|
Loading…
Reference in New Issue
Block a user