commit 0da28e9cfac412fd0f748003a5054c8928e5446f · pyrox.dev/nixpkgs

+28

pkgs/applications/misc/xsw/default.nix

···

       1
       1
       +
       { stdenv, fetchFromGitHub, pkgconfig, autoconf, automake, SDL, SDL_image, SDL_ttf, SDL_gfx, flex, bison }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         name = "xsw-${version}";

     

       5
       5
       +
         version = "0.1.2";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "andrenho";

     

       9
       9
       +
           repo = "xsw";

     

       10
       10
       +
           rev = version;

     

       11
       11
       +
           sha256 = "092vp61ngd2vscsvyisi7dv6qrk5m1i81gg19hyfl5qvjq5p0p8g";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         buildInputs = [ pkgconfig autoconf automake SDL SDL_image SDL_ttf SDL_gfx flex bison ];

     

       15
       15
       +
       

     

       16
       16
       +
         patches = [

     

       17
       17
       +
           ./parse.patch # Fixes compilation error by avoiding redundant definitions.

     

       18
       18
       +
         ];

     

       19
       19
       +
       

     

       20
       20
       +
         meta = with stdenv.lib; {

     

       21
       21
       +
           inherit (src.meta) homepage;

     

       22
       22
       +
           description = "A slide show presentation tool";

     

       23
       23
       +
       

     

       24
       24
       +
           platforms = platforms.unix;

     

       25
       25
       +
           license  = licenses.gpl3;

     

       26
       26
       +
           maintainers = [ maintainers.vrthra ];

     

       27
       27
       +
         };

     

       28
       28
       +
       }

+21

pkgs/applications/misc/xsw/parse.patch

···

       1
       1
       +
       The `%code` causes Color definition to be added in both parser.h and parser.c

     

       2
       2
       +
       causing duplicate definitions error. This ensures that once it has been included

     

       3
       3
       +
       as part of parser.h, it wont be redefined in parser.c

     

       4
       4
       +
       

     

       5
       5
       +
       --- xsw-0.1.2-src/src/parser.y	1969-12-31 16:00:01.000000000 -0800

     

       6
       6
       +
       +++ xsw-0.1.2-src/src/parser.y	2016-06-28 13:21:35.707027770 -0700

     

       7
       7
       +
       @@ -38,7 +38,13 @@

     

       8
       8
       +
        

     

       9
       9
       +
        %}

     

       10
       10
       +
        

     

       11
       11
       +
       -%code requires { typedef struct { unsigned char c; } Color; }

     

       12
       12
       +
       +%code requires

     

       13
       13
       +
       +{

     

       14
       14
       +
       +#ifndef COLORDEF

     

       15
       15
       +
       +#define COLORDEF

     

       16
       16
       +
       +typedef struct { unsigned char c; } Color;

     

       17
       17
       +
       +#endif

     

       18
       18
       +
       +}

     

       19
       19
       +
        

     

       20
       20
       +
        %token SLIDE COLON HIFEN TEXT X Y W H IMAGE SIZE SCALE TEMPLATE BACKGROUND FONT

     

       21
       21
       +
        %token STYLE ALIGN EXPAND PLUS IMAGE_PATH

pkgs/top-level/all-packages.nix

···

       17184
       17184
        
           libpng = libpng12;

     

       17185
       17185
        
         };

     

       17186
       17186
        
       

     

       17187
       17187
       +
         xsw = callPackage ../applications/misc/xsw {

     

       17188
       17188
       +
          # Enable the next line to use this in terminal.

     

       17189
       17189
       +
          # Note that it requires sixel capable terminals such as mlterm

     

       17190
       17190
       +
          # or xterm -ti 340

     

       17191
       17191
       +
          SDL = SDL_sixel;

     

       17192
       17192
       +
         };

     

       17193
       17193
       +
       

     

       17187
       17194
        
         xwiimote = callPackage ../misc/drivers/xwiimote {

     

       17188
       17195
        
           bluez = pkgs.bluez5.override {

     

       17189
       17196
        
             enableWiimote = true;