diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-06-04 13:00:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-04 13:00:24 +0000 |
| commit | 065a1dcee63248eaf030d2c215b6f5e86f7a0634 (patch) | |
| tree | 6f1fe897f930c521d75c53fd81bfa873bd654c38 /pkgs/applications/graphics | |
| parent | 9e48485e2363ac76f98b6c89a517eacfdea04f95 (diff) | |
| parent | f36a65f6e2e9f3641f12c7d6e48a5ec4b5c5394b (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/nufraw/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/graphics/nufraw/move-extern-c.patch | 21 |
2 files changed, 25 insertions, 0 deletions
diff --git a/pkgs/applications/graphics/nufraw/default.nix b/pkgs/applications/graphics/nufraw/default.nix index e49093c568cbd..f6031bea069d9 100644 --- a/pkgs/applications/graphics/nufraw/default.nix +++ b/pkgs/applications/graphics/nufraw/default.nix @@ -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"; diff --git a/pkgs/applications/graphics/nufraw/move-extern-c.patch b/pkgs/applications/graphics/nufraw/move-extern-c.patch new file mode 100644 index 0000000000000..43a4942d3e62d --- /dev/null +++ b/pkgs/applications/graphics/nufraw/move-extern-c.patch @@ -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__) \ |