diff --git a/pkgs/applications/graphics/giv/default.nix b/pkgs/applications/graphics/giv/default.nix index a6cf6b205dc0..d32ef5bbebc9 100644 --- a/pkgs/applications/graphics/giv/default.nix +++ b/pkgs/applications/graphics/giv/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sed -i s,/usr/local,$out, SConstruct ''; - patches = [ ./build.patch ]; + patches = [ ./build.patch ./union.patch ]; buildPhase = "scons"; diff --git a/pkgs/applications/graphics/giv/union.patch b/pkgs/applications/graphics/giv/union.patch new file mode 100644 index 000000000000..f12fce036135 --- /dev/null +++ b/pkgs/applications/graphics/giv/union.patch @@ -0,0 +1,38 @@ +Already reported uptream + +diff --git a/src/giv-data.h b/src/giv-data.h +index 64e7696..d34bfe4 100644 +--- a/src/giv-data.h ++++ b/src/giv-data.h +@@ -88,7 +88,7 @@ typedef struct + typedef struct + { + gint op; +- union ++ struct + { + struct + { +diff --git a/src/giv_types.h b/src/giv_types.h +index 02abebe..c3cfb78 100644 +--- a/src/giv_types.h ++++ b/src/giv_types.h +@@ -11,13 +11,11 @@ typedef struct { + + typedef struct { + gint op; +- union { +- struct { +- gdouble x,y; +- } point; +- double arc_dev; +- text_mark_t *text_object; +- } data; ++ struct { ++ gdouble x,y; ++ } point; ++ double arc_dev; ++ text_mark_t *text_object; + } point_t; + + typedef struct {