commit cea145942d86da8a4747f1a9fb53ad2e58b2ed70 · pyrox.dev/nixpkgs

+2 -2

pkgs/games/gimx/conf.patch

···

       7
        
        

     

       8
        
          snprintf(file_path, sizeof(file_path), "%s%s%s%s", gimx_params.homedir, GIMX_DIR, CONFIG_DIR, file);

     

       9
        
       -

     

       10
       -
       +  if(getenv("GIMXCONF")) { snprintf(file_path, sizeof(file_path), "%s", file); }

     

       11
        
          if(read_file(file_path) == -1)

     

       12
        
          {

     

       13
        
            gerror("read_file failed\n");

     
···

       20
        
        

     

       21
        
          snprintf(file_path, sizeof(file_path), "%s%s%s%s", gimx_params.homedir, GIMX_DIR, CONFIG_DIR, gimx_params.config_file);

     

       22
        
       -

     

       23
       -
       +  if(getenv("GIMXCONF")) { snprintf(file_path, sizeof(file_path), "%s", gimx_params.config_file); }

     

       24
        
          FILE * fp = gfile_fopen(file_path, "r");

     

       25
        
          if (fp == NULL)

     

       26
        
          {

···

       7
        
        

     

       8
        
          snprintf(file_path, sizeof(file_path), "%s%s%s%s", gimx_params.homedir, GIMX_DIR, CONFIG_DIR, file);

     

       9
        
       -

     

       10
       +
       +  snprintf(file_path, sizeof(file_path), "%s", file);

     

       11
        
          if(read_file(file_path) == -1)

     

       12
        
          {

     

       13
        
            gerror("read_file failed\n");

     
···

       20
        
        

     

       21
        
          snprintf(file_path, sizeof(file_path), "%s%s%s%s", gimx_params.homedir, GIMX_DIR, CONFIG_DIR, gimx_params.config_file);

     

       22
        
       -

     

       23
       +
       +  snprintf(file_path, sizeof(file_path), "%s", gimx_params.config_file);

     

       24
        
          FILE * fp = gfile_fopen(file_path, "r");

     

       25
        
          if (fp == NULL)

     

       26
        
          {

-104

pkgs/games/gimx/custom/Dualshock4.xml

···

       1
       -
       <?xml version="1.0" encoding="UTF-8"?>

     

       2
       -
       <root>

     

       3
       -
         <controller id="1" dpi="0" type="DS4">

     

       4
       -
           <configuration id="1">

     

       5
       -
             <trigger type="" id="" name="" button_id="" switch_back="no" delay="0"/>

     

       6
       -
             <mouse_options_list/>

     

       7
       -
             <intensity_list/>

     

       8
       -
             <button_map>

     

       9
       -
               <button id="abs_axis_10" label="">

     

       10
       -
                 <device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/>

     

       11
       -
                 <event type="button" id="3"/>

     

       12
       -
               </button>

     

       13
       -
               <button id="abs_axis_9" label="">

     

       14
       -
                 <device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/>

     

       15
       -
                 <event type="button" id="0"/>

     

       16
       -
               </button>

     

       17
       -
               <button id="abs_axis_8" label="">

     

       18
       -
                 <device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/>

     

       19
       -
                 <event type="button" id="1"/>

     

       20
       -
               </button>

     

       21
       -
               <button id="abs_axis_7" label="">

     

       22
       -
                 <device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/>

     

       23
       -
                 <event type="button" id="2"/>

     

       24
       -
               </button>

     

       25
       -
               <button id="abs_axis_11" label="">

     

       26
       -
                 <device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/>

     

       27
       -
                 <event type="button" id="4"/>

     

       28
       -
               </button>

     

       29
       -
               <button id="abs_axis_12" label="">

     

       30
       -
                 <device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/>

     

       31
       -
                 <event type="button" id="5"/>

     

       32
       -
               </button>

     

       33
       -
               <button id="abs_axis_0" label="">

     

       34
       -
                 <device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/>

     

       35
       -
                 <event type="button" id="8"/>

     

       36
       -
               </button>

     

       37
       -
               <button id="abs_axis_1" label="">

     

       38
       -
                 <device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/>

     

       39
       -
                 <event type="button" id="9"/>

     

       40
       -
               </button>

     

       41
       -
               <button id="abs_axis_15" label="">

     

       42
       -
                 <device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/>

     

       43
       -
                 <event type="button" id="11"/>

     

       44
       -
               </button>

     

       45
       -
               <button id="abs_axis_16" label="">

     

       46
       -
                 <device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/>

     

       47
       -
                 <event type="button" id="12"/>

     

       48
       -
               </button>

     

       49
       -
               <button id="abs_axis_2" label="">

     

       50
       -
                 <device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/>

     

       51
       -
                 <event type="button" id="10"/>

     

       52
       -
               </button>

     

       53
       -
               <button id="abs_axis_3" label="">

     

       54
       -
                 <device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/>

     

       55
       -
                 <event type="button" id="13"/>

     

       56
       -
               </button>

     

       57
       -
               <button id="abs_axis_4" label="">

     

       58
       -
                 <device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/>

     

       59
       -
                 <event type="button" id="14"/>

     

       60
       -
               </button>

     

       61
       -
               <button id="abs_axis_5" label="">

     

       62
       -
                 <device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/>

     

       63
       -
                 <event type="button" id="15"/>

     

       64
       -
               </button>

     

       65
       -
               <button id="abs_axis_6" label="">

     

       66
       -
                 <device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/>

     

       67
       -
                 <event type="button" id="16"/>

     

       68
       -
               </button>

     

       69
       -
             </button_map>

     

       70
       -
             <axis_map>

     

       71
       -
               <axis id="rel_axis_0" label="">

     

       72
       -
                 <device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/>

     

       73
       -
                 <event type="axis" id="0" dead_zone="0" multiplier="0.004" exponent="1.00" shape=""/>

     

       74
       -
               </axis>

     

       75
       -
               <axis id="rel_axis_1" label="">

     

       76
       -
                 <device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/>

     

       77
       -
                 <event type="axis" id="1" dead_zone="0" multiplier="0.004" exponent="1.00" shape=""/>

     

       78
       -
               </axis>

     

       79
       -
               <axis id="rel_axis_2" label="">

     

       80
       -
                 <device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/>

     

       81
       -
                 <event type="axis" id="3" dead_zone="0" multiplier="0.004" exponent="1.00" shape=""/>

     

       82
       -
               </axis>

     

       83
       -
               <axis id="rel_axis_3" label="">

     

       84
       -
                 <device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/>

     

       85
       -
                 <event type="axis" id="4" dead_zone="0" multiplier="0.004" exponent="1.00" shape=""/>

     

       86
       -
               </axis>

     

       87
       -
               <axis id="abs_axis_13" label="">

     

       88
       -
                 <device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/>

     

       89
       -
                 <event type="axis" id="2" dead_zone="0" multiplier="0.008" exponent="1.00" shape=""/>

     

       90
       -
               </axis>

     

       91
       -
               <axis id="abs_axis_14" label="">

     

       92
       -
                 <device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/>

     

       93
       -
                 <event type="axis" id="5" dead_zone="0" multiplier="0.008" exponent="1.00" shape=""/>

     

       94
       -
               </axis>

     

       95
       -
             </axis_map>

     

       96
       -
             <joystick_corrections_list/>

     

       97
       -
             <force_feedback>

     

       98
       -
               <device type="joystick" id="0" name="Sony Computer Entertainment Wireless Controller"/>

     

       99
       -
               <inversion enable="no"/>

     

       100
       -
               <gain rumble="0" constant="0" spring="0" damper="0"/>

     

       101
       -
             </force_feedback>

     

       102
       -
           </configuration>

     

       103
       -
         </controller>

     

       104
       -
       </root>

+14 -63

pkgs/games/gimx/default.nix

···

       1
       -
       { stdenv, lib, fetchFromGitHub, fetchpatch

     

       2
       -
       , makeWrapper, curl, libusb1, xorg, libxml2

     

       3
       -
       , ncurses5, bluez, libmhash, gimxPdpGamepad ? false }:

     

       4
        
       

     

       5
        
       let

     

       6
        
         gimx-config = fetchFromGitHub {

     

       7
        
           owner = "matlo";

     

       8
        
           repo = "GIMX-configurations";

     

       9
        
           rev = "c20300f24d32651d369e2b27614b62f4b856e4a0";

     

       10
       -
           sha256 = "02wcjk8da188x7y0jf3p0arjdh9zbb0lla3fxdb28b1xyybfvx5p";

     

       11
        
         };

     

       12
        
       

     

       13
        
       in stdenv.mkDerivation rec {

     

       14
        
         pname = "gimx";

     

       15
       -
         version = "unstable-2021-08-31";

     

       16
        
       

     

       17
        
         src = fetchFromGitHub {

     

       18
        
           owner = "matlo";

     

       19
        
           repo = "GIMX";

     

       20
       -
           rev = "58d2098dce75ed4c90ae649460d3a7a150f4ef0a";

     

       21
        
           fetchSubmodules = true;

     

       22
       -
           sha256 = "05kdv2qqr311c2p76hdlgvrq7b04vcpps5c80zn8b8l7p831ilgz";

     

       23
        
         };

     

       24
        
       

     

       25
       -
         patches = [

     

       26
       -
           ./conf.patch

     

       27
       -
       

     

       28
       -
           # gcc-13 build fixes:

     

       29
       -
           #   https://github.com/matlo/GIMX/pull/705

     

       30
       -
           (fetchpatch {

     

       31
       -
             name = "gcc-13-headers.patch";

     

       32
       -
             url = "https://github.com/matlo/GIMX/commit/4525dff4d9af672116d8c6c182707f2ad6295b2d.patch";

     

       33
       -
             hash = "sha256-LkswnFsxqADooa09yO7Yf0AbxTrGfjBObyv/6FQJvRs=";

     

       34
       -
           })

     

       35
       -
           (fetchpatch {

     

       36
       -
             name = "gcc-13-protos.patch";

     

       37
       -
             url = "https://github.com/matlo/GIMX/commit/f11855fcb8bd9d0cb9c94871b4111ddfd5b610df.patch";

     

       38
       -
             hash = "sha256-JL67UUsEyPcOuaimJtMviiGLGghuq9665Lg1QuiaWUU=";

     

       39
       -
           })

     

       40
       -
         ];

     

       41
        
       

     

       42
        
         nativeBuildInputs = [ makeWrapper ];

     

       43
       -
         buildInputs = [

     

       44
       -
           curl libusb1 bluez libxml2 ncurses5 libmhash

     

       45
       -
           xorg.libX11 xorg.libXi xorg.libXext

     

       46
       -
         ];

     

       47
       -
       

     

       48
       -
         postPatch = lib.optionals gimxPdpGamepad ''

     

       49
       -
           substituteInPlace ./shared/gimxcontroller/include/x360.h \

     

       50
       -
             --replace "0x045e" "0x0e6f" --replace "0x028e" "0x0213"

     

       51
       -
           substituteInPlace ./loader/firmware/EMU360.hex \

     

       52
       -
             --replace "1B210001" "1B211001" \

     

       53
       -
             --replace "09210001" "09211001" \

     

       54
       -
             --replace "5E048E021001" "6F0E13020001"

     

       55
       -
         '';

     

       56
       -
       

     

       57
        
         makeFlags = [ "build-core" ];

     

       58
        
       

     

       59
       -
         env.NIX_CFLAGS_COMPILE = toString [

     

       60
       -
           # Needed with GCC 12

     

       61
       -
           "-Wno-error=address"

     

       62
       -
           "-Wno-error=deprecated-declarations"

     

       63
       -
           "-Wno-error=use-after-free"

     

       64
       -
         ];

     

       65
       -
       

     

       66
        
         installPhase = ''

     

       67
        
           runHook preInstall

     

       68
        
       

     

       69
        
           mkdir -p $out

     

       70
       -
           substituteInPlace ./core/Makefile --replace "chmod ug+s" "echo"

     

       71
       -
       

     

       72
        
           export DESTDIR="$out"

     

       73
        
           make install-shared install-core

     

       74
        
           mv $out/usr/lib $out/lib

     

       75
        
           mv $out/usr/bin $out/bin

     

       76
       -
           rmdir $out/usr

     

       77
       -
       

     

       78
       -
           runHook postInstall

     

       79
       -
         '';

     

       80
        
       

     

       81
       -
         postInstall = ''

     

       82
       -
           mkdir -p $out/share

     

       83
       -
           cp -r ./loader/firmware $out/share/firmware

     

       84
       -
           cp -r ${gimx-config}/Linux $out/share/config

     

       85
       -
           cp -r ${./custom} $out/share/custom

     

       86
        
       

     

       87
       -
           makeWrapper $out/bin/gimx $out/bin/gimx-dualshock4 \

     

       88
       -
             --set GIMXCONF 1 --add-flags "--nograb" --add-flags "-p /dev/ttyUSB0" \

     

       89
       -
             --add-flags "-c $out/share/custom/Dualshock4.xml"

     

       90
       -
       

     

       91
       -
           makeWrapper $out/bin/gimx $out/bin/gimx-xboxonepad \

     

       92
       -
             --set GIMXCONF 1 --add-flags "--nograb" --add-flags "-p /dev/ttyUSB0" \

     

       93
       -
             --add-flags "-c $out/share/config/XOnePadUsb.xml"

     

       94
        
         '';

     

       95
        
       

     

       96
        
         meta = with lib; {

     
···

       98
        
           description = "Game Input Multiplexer";

     

       99
        
           license = licenses.gpl3Only;

     

       100
        
           platforms = platforms.linux;

     

       101
       -
           maintainers = with maintainers; [ bb2020 ];

     

       102
        
         };

     

       103
        
       }

···

       1
       +
       { stdenv, lib, fetchFromGitHub, makeWrapper, curl, libusb1, bluez, libxml2, ncurses5, libmhash, xorg }:

     

       0
        
       
     

       0
        
       
     

       2
        
       

     

       3
        
       let

     

       4
        
         gimx-config = fetchFromGitHub {

     

       5
        
           owner = "matlo";

     

       6
        
           repo = "GIMX-configurations";

     

       7
        
           rev = "c20300f24d32651d369e2b27614b62f4b856e4a0";

     

       8
       +
           hash = "sha256-t/Ttlvc9LCRW624oSsFaP8EmswJ3OAn86QgF1dCUjAs=";

     

       9
        
         };

     

       10
        
       

     

       11
        
       in stdenv.mkDerivation rec {

     

       12
        
         pname = "gimx";

     

       13
       +
         version = "8.0";

     

       14
        
       

     

       15
        
         src = fetchFromGitHub {

     

       16
        
           owner = "matlo";

     

       17
        
           repo = "GIMX";

     

       18
       +
           rev = "v${version}";

     

       19
        
           fetchSubmodules = true;

     

       20
       +
           hash = "sha256-BcFLdQgEAi6Sxyb5/P9YAIkmeXNZXrKcOa/6g817xQg=";

     

       21
        
         };

     

       22
        
       

     

       23
       +
         env.NIX_CFLAGS_COMPILE = "-Wno-error";

     

       24
       +
         patches = [ ./conf.patch ./gcc14.patch ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       25
        
       

     

       26
        
         nativeBuildInputs = [ makeWrapper ];

     

       27
       +
         buildInputs = [ curl libusb1 bluez libxml2 ncurses5 libmhash xorg.libX11 xorg.libXi ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       28
        
         makeFlags = [ "build-core" ];

     

       29
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       30
        
         installPhase = ''

     

       31
        
           runHook preInstall

     

       32
        
       

     

       33
        
           mkdir -p $out

     

       34
       +
           substituteInPlace ./core/Makefile --replace-fail "chmod ug+s" "echo"

     

       0
        
       
     

       35
        
           export DESTDIR="$out"

     

       36
        
           make install-shared install-core

     

       37
        
           mv $out/usr/lib $out/lib

     

       38
        
           mv $out/usr/bin $out/bin

     

       39
       +
           cp -r ${gimx-config}/Linux $out/share

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       40
        
       

     

       41
       +
           makeWrapper $out/bin/gimx $out/bin/gimx-ds4 \

     

       42
       +
             --add-flags "--nograb" --add-flags "-p /dev/ttyUSB0" \

     

       43
       +
             --add-flags "-c $out/share/Dualshock4.xml"

     

       0
        
       
     

       0
        
       
     

       44
        
       

     

       45
       +
           runHook postInstall

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       46
        
         '';

     

       47
        
       

     

       48
        
         meta = with lib; {

     
···

       50
        
           description = "Game Input Multiplexer";

     

       51
        
           license = licenses.gpl3Only;

     

       52
        
           platforms = platforms.linux;

     

       0
        
       
     

       53
        
         };

     

       54
        
       }

+26

pkgs/games/gimx/gcc14.patch

···

       1
       +
       diff --git a/core/config_reader.c b/core/config_reader.c

     

       2
       +
       index 451fc48..737d27c 100644

     

       3
       +
       --- a/core/config_reader.c

     

       4
       +
       +++ b/core/config_reader.c

     

       5
       +
       @@ -17,7 +17,7 @@

     

       6
       +
        #include "../directories.h"

     

       7
       +
        #include "macros.h"

     

       8
       +
        #include <errno.h>

     

       9
       +
       -

     

       10
       +
       +#include <stdlib.h>

     

       11
       +
        /*

     

       12
       +
         * These variables are used to read the configuration.

     

       13
       +
         */

     

       14
       +
       diff --git a/core/gimx.c b/core/gimx.c

     

       15
       +
       index 700cae9..693f72f 100755

     

       16
       +
       --- a/core/gimx.c

     

       17
       +
       +++ b/core/gimx.c

     

       18
       +
       @@ -8,7 +8,7 @@

     

       19
       +
        #include <errno.h> //to print errors

     

       20
       +
        #include <string.h> //to print errors

     

       21
       +
        #include <limits.h> //PATH_MAX

     

       22
       +
       -

     

       23
       +
       +#include <stdlib.h>

     

       24
       +
        #ifndef WIN32

     

       25
       +
        #include <termios.h> //to disable/enable echo

     

       26
       +
        #include <unistd.h>