diff options
author | Rahul Gopinath <rahul@gopinath.org> | 2016-06-28 13:25:48 -0700 |
---|---|---|
committer | Rahul Gopinath <rahul@gopinath.org> | 2016-07-03 15:56:38 -0700 |
commit | cfe4ad243131b744ed5406c54506fd49d01d85ff (patch) | |
tree | 1db9a40d7a10f20db5b04f312d5cbe02e208c41f /pkgs/applications/misc/xsw | |
parent | 323eb0649929d1580ba1f8cc5812dba33f9e354b (diff) | |
download | nixlib-cfe4ad243131b744ed5406c54506fd49d01d85ff.tar nixlib-cfe4ad243131b744ed5406c54506fd49d01d85ff.tar.gz nixlib-cfe4ad243131b744ed5406c54506fd49d01d85ff.tar.bz2 nixlib-cfe4ad243131b744ed5406c54506fd49d01d85ff.tar.lz nixlib-cfe4ad243131b744ed5406c54506fd49d01d85ff.tar.xz nixlib-cfe4ad243131b744ed5406c54506fd49d01d85ff.tar.zst nixlib-cfe4ad243131b744ed5406c54506fd49d01d85ff.zip |
xsw: init at 0.1.2
Diffstat (limited to 'pkgs/applications/misc/xsw')
-rw-r--r-- | pkgs/applications/misc/xsw/default.nix | 28 | ||||
-rw-r--r-- | pkgs/applications/misc/xsw/parse.patch | 21 |
2 files changed, 49 insertions, 0 deletions
diff --git a/pkgs/applications/misc/xsw/default.nix b/pkgs/applications/misc/xsw/default.nix new file mode 100644 index 000000000000..57ea8fe19218 --- /dev/null +++ b/pkgs/applications/misc/xsw/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, pkgconfig, autoconf, automake, SDL, SDL_image, SDL_ttf, SDL_gfx, flex, bison }: + +stdenv.mkDerivation rec { + name = "xsw-${version}"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "andrenho"; + repo = "xsw"; + rev = version; + sha256 = "092vp61ngd2vscsvyisi7dv6qrk5m1i81gg19hyfl5qvjq5p0p8g"; + }; + + buildInputs = [ pkgconfig autoconf automake SDL SDL_image SDL_ttf SDL_gfx flex bison ]; + + patches = [ + ./parse.patch # Fixes compilation error by avoiding redundant definitions. + ]; + + meta = with stdenv.lib; { + inherit (src.meta) homepage; + description = "A slide show presentation tool"; + + platforms = platforms.unix; + license = licenses.gpl3; + maintainers = [ maintainers.vrthra ]; + }; +} diff --git a/pkgs/applications/misc/xsw/parse.patch b/pkgs/applications/misc/xsw/parse.patch new file mode 100644 index 000000000000..6db6c14c26a7 --- /dev/null +++ b/pkgs/applications/misc/xsw/parse.patch @@ -0,0 +1,21 @@ +The `%code` causes Color definition to be added in both parser.h and parser.c +causing duplicate definitions error. This ensures that once it has been included +as part of parser.h, it wont be redefined in parser.c + +--- xsw-0.1.2-src/src/parser.y 1969-12-31 16:00:01.000000000 -0800 ++++ xsw-0.1.2-src/src/parser.y 2016-06-28 13:21:35.707027770 -0700 +@@ -38,7 +38,13 @@ + + %} + +-%code requires { typedef struct { unsigned char c; } Color; } ++%code requires ++{ ++#ifndef COLORDEF ++#define COLORDEF ++typedef struct { unsigned char c; } Color; ++#endif ++} + + %token SLIDE COLON HIFEN TEXT X Y W H IMAGE SIZE SCALE TEMPLATE BACKGROUND FONT + %token STYLE ALIGN EXPAND PLUS IMAGE_PATH |