commit 3ab6e84b79abc45855e666fff33078189b4960c3 · pyrox.dev/nixpkgs

+1 -1

nixos/modules/services/hardware/spacenavd.nix

···

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         config = mkIf cfg.enable {

     

       16
       16
       -
           systemd.user.services.spacenavd = {

     

       16
       16
       +
           systemd.services.spacenavd = {

     

       17
       17
        
             description = "Daemon for the Spacenavigator 6DOF mice by 3Dconnexion";

     

       18
       18
        
             after = [ "syslog.target" ];

     

       19
       19
        
             wantedBy = [ "graphical.target" ];

+2 -1

pkgs/applications/graphics/freecad/default.nix

···

       1
       1
        
       { lib

     

       2
       2
       +
       , stdenv

     

       2
       3
        
       , mkDerivation

     

       3
       4
        
       , fetchFromGitHub

     

       4
       5
        
       , fetchpatch

     
···

       35
       36
        
       , scipy

     

       36
       37
        
       , shiboken2

     

       37
       38
        
       , soqt

     

       38
       38
       -
       , spaceNavSupport ? false

     

       39
       39
       +
       , spaceNavSupport ? stdenv.isLinux

     

       39
       40
        
       , swig

     

       40
       41
        
       , vtk

     

       41
       42
        
       , wrapQtAppsHook

+8 -1

pkgs/applications/graphics/openscad/default.nix

···

       25
       25
        
       , mkDerivation

     

       26
       26
        
       , qtmacextras

     

       27
       27
        
       , qmake

     

       28
       28
       +
       , spacenavSupport ? stdenv.isLinux, libspnav

     

       28
       29
        
       }:

     

       29
       30
        
       

     

       30
       31
        
       mkDerivation rec {

     
···

       46
       47
        
           qtbase qtmultimedia qscintilla

     

       47
       48
        
         ] ++ lib.optionals stdenv.isLinux [ libGLU libGL ]

     

       48
       49
        
           ++ lib.optional stdenv.isDarwin qtmacextras

     

       50
       50
       +
           ++ lib.optional spacenavSupport libspnav

     

       49
       51
        
         ;

     

       50
       52
        
       

     

       51
       51
       -
         qmakeFlags = [ "VERSION=${version}" ];

     

       53
       53
       +
         qmakeFlags = [ "VERSION=${version}" ] ++

     

       54
       54
       +
           lib.optionals spacenavSupport [

     

       55
       55
       +
             "ENABLE_SPNAV=1"

     

       56
       56
       +
             "SPNAV_INCLUDEPATH=${libspnav}/include"

     

       57
       57
       +
             "SPNAV_LIBPATH=${libspnav}/lib"

     

       58
       58
       +
           ];

     

       52
       59
        
       

     

       53
       60
        
         # src/lexer.l:36:10: fatal error: parser.hxx: No such file or directory

     

       54
       61
        
         enableParallelBuilding = false; # true by default due to qmake

+1 -1

pkgs/applications/misc/blender/default.nix

···

       7
       7
        
       , jackaudioSupport ? false, libjack2

     

       8
       8
        
       , cudaSupport ? config.cudaSupport or false, cudatoolkit

     

       9
       9
        
       , colladaSupport ? true, opencollada

     

       10
       10
       -
       , spaceNavSupport ? false, libspnav

     

       10
       10
       +
       , spaceNavSupport ? stdenv.isLinux, libspnav

     

       11
       11
        
       , makeWrapper

     

       12
       12
        
       , pugixml, llvmPackages, SDL, Cocoa, CoreGraphics, ForceFeedback, OpenAL, OpenGL

     

       13
       13
        
       , embree, gmp

+28

pkgs/applications/misc/spnavcfg/default.nix

···

       1
       1
       +
       { stdenv, lib, fetchFromGitHub, pkg-config, gtk2 }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         pname = "spnavcfg";

     

       5
       5
       +
         version = "0.3.1";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchFromGitHub {

     

       8
       8
       +
           owner = "FreeSpacenav";

     

       9
       9
       +
           repo = pname;

     

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

     

       11
       11
       +
           sha256 = "180mkdis15gxs79rr3f7hpwa1p6v81bybw37pzzdjnmqwqrc08a0";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         postPatch = ''

     

       15
       15
       +
           sed -i s/4775/775/ Makefile.in

     

       16
       16
       +
         '';

     

       17
       17
       +
       

     

       18
       18
       +
         nativeBuildInputs = [ pkg-config ];

     

       19
       19
       +
         buildInputs = [ gtk2 ];

     

       20
       20
       +
       

     

       21
       21
       +
         meta = with lib; {

     

       22
       22
       +
           homepage = "http://spacenav.sourceforge.net/";

     

       23
       23
       +
           description = "Interactive configuration GUI for space navigator input devices";

     

       24
       24
       +
           license = licenses.gpl3Plus;

     

       25
       25
       +
           platforms = platforms.unix;

     

       26
       26
       +
           maintainers = with maintainers; [ gebner ];

     

       27
       27
       +
         };

     

       28
       28
       +
       }

-47

pkgs/development/libraries/libspnav/configure-socket-path.patch

···

       1
       1
       -
       diff --git a/spnav.c b/spnav.c

     

       2
       2
       -
       index f9e10f8..27149f7 100644

     

       3
       3
       -
       --- a/spnav.c

     

       4
       4
       -
       +++ b/spnav.c

     

       5
       5
       -
       @@ -36,7 +36,7 @@ OF SUCH DAMAGE.

     

       6
       6
       -
        #include <sys/select.h>

     

       7
       7
       -
        #include "spnav.h"

     

       8
       8
       -
        

     

       9
       9
       -
       -#define SPNAV_SOCK_PATH "/var/run/spnav.sock"

     

       10
       10
       -
       +#define DEFAULT_SPNAV_SOCK_PATH "/run/spnav.sock"

     

       11
       11
       -
        

     

       12
       12
       -
        #ifdef USE_X11

     

       13
       13
       -
        #include <X11/Xlib.h>

     

       14
       14
       -
       @@ -70,6 +70,24 @@ static struct event_node *ev_queue, *ev_queue_tail;

     

       15
       15
       -
        /* AF_UNIX socket used for alternative communication with daemon */

     

       16
       16
       -
        static int sock = -1;

     

       17
       17
       -
        

     

       18
       18
       -
       +static char *spath = NULL;

     

       19
       19
       -
       +

     

       20
       20
       -
       +static char *socket_path()

     

       21
       21
       -
       +{

     

       22
       22
       -
       +	char *xdg_runtime_dir;

     

       23
       23
       -
       +	if((xdg_runtime_dir = getenv("XDG_RUNTIME_DIR"))) {

     

       24
       24
       -
       +		if ( spath == NULL ) {

     

       25
       25
       -
       +			spath = malloc(strlen(xdg_runtime_dir) + strlen("/spnav.sock") + 1);

     

       26
       26
       -
       +			if ( spath != NULL ) {

     

       27
       27
       -
       +				sprintf(spath, sizeof(spath), "%s/spnav.sock", xdg_runtime_dir);

     

       28
       28
       -
       +			}

     

       29
       29
       -
       +		}

     

       30
       30
       -
       +		if(access(spath, F_OK)){

     

       31
       31
       -
       +			return spath;

     

       32
       32
       -
       +		}

     

       33
       33
       -
       +	}

     

       34
       34
       -
       +	return DEFAULT_SPNAV_SOCK_PATH;

     

       35
       35
       -
       +}

     

       36
       36
       -
        

     

       37
       37
       -
        int spnav_open(void)

     

       38
       38
       -
        {

     

       39
       39
       -
       @@ -92,7 +110,7 @@ int spnav_open(void)

     

       40
       40
       -
        

     

       41
       41
       -
        	memset(&addr, 0, sizeof addr);

     

       42
       42
       -
        	addr.sun_family = AF_UNIX;

     

       43
       43
       -
       -	strncpy(addr.sun_path, SPNAV_SOCK_PATH, sizeof(addr.sun_path));

     

       44
       44
       -
       +	strncpy(addr.sun_path, socket_path(), sizeof(addr.sun_path));

     

       45
       45
       -
        

     

       46
       46
       -
        

     

       47
       47
       -
        	if(connect(s, (struct sockaddr*)&addr, sizeof addr) == -1) {

-6

pkgs/development/libraries/libspnav/default.nix

···

       13
       13
        
       

     

       14
       14
        
         buildInputs = [ libX11 ];

     

       15
       15
        
       

     

       16
       16
       -
         patches = [

     

       17
       17
       -
           # Changes the socket path from /run/spnav.sock to $XDG_RUNTIME_DIR/spnav.sock

     

       18
       18
       -
           # to allow for a user service

     

       19
       19
       -
           ./configure-socket-path.patch

     

       20
       20
       -
         ];

     

       21
       21
       -
       

     

       22
       16
        
         configureFlags = [ "--disable-debug"];

     

       23
       17
        
       

     

       24
       18
        
         preInstall = ''

-118

pkgs/misc/drivers/spacenavd/configure-socket-path.patch

···

       1
       1
       -
       diff --git a/src/proto_unix.c b/src/proto_unix.c

     

       2
       2
       -
       index 998f234..d38452c 100644

     

       3
       3
       -
       --- a/src/proto_unix.c

     

       4
       4
       -
       +++ b/src/proto_unix.c

     

       5
       5
       -
       @@ -36,11 +36,14 @@ enum {

     

       6
       6
       -
        

     

       7
       7
       -
        static int lsock = -1;

     

       8
       8
       -
        

     

       9
       9
       -
       +static char *spath = NULL;

     

       10
       10
       -
       +

     

       11
       11
       -
        int init_unix(void)

     

       12
       12
       -
        {

     

       13
       13
       -
        	int s;

     

       14
       14
       -
        	mode_t prev_umask;

     

       15
       15
       -
        	struct sockaddr_un addr;

     

       16
       16
       -
       +	char *sock_path;

     

       17
       17
       -
        

     

       18
       18
       -
        	if(lsock >= 0) return 0;

     

       19
       19
       -
        

     

       20
       20
       -
       @@ -49,16 +52,18 @@ int init_unix(void)

     

       21
       21
       -
        		return -1;

     

       22
       22
       -
        	}

     

       23
       23
       -
        

     

       24
       24
       -
       -	unlink(SOCK_NAME);	/* in case it already exists */

     

       25
       25
       -
       +	sock_path = socket_path();

     

       26
       26
       -
       +

     

       27
       27
       -
       +	unlink(sock_path);	/* in case it already exists */

     

       28
       28
       -
        

     

       29
       29
       -
        	memset(&addr, 0, sizeof addr);

     

       30
       30
       -
        	addr.sun_family = AF_UNIX;

     

       31
       31
       -
       -	strcpy(addr.sun_path, SOCK_NAME);

     

       32
       32
       -
       +	strcpy(addr.sun_path, sock_path);

     

       33
       33
       -
        

     

       34
       34
       -
        	prev_umask = umask(0);

     

       35
       35
       -
        

     

       36
       36
       -
        	if(bind(s, (struct sockaddr*)&addr, sizeof addr) == -1) {

     

       37
       37
       -
       -		logmsg(LOG_ERR, "failed to bind unix socket: %s: %s\n", SOCK_NAME, strerror(errno));

     

       38
       38
       -
       +		logmsg(LOG_ERR, "failed to bind unix socket: %s: %s\n", sock_path, strerror(errno));

     

       39
       39
       -
        		close(s);

     

       40
       40
       -
        		return -1;

     

       41
       41
       -
        	}

     

       42
       42
       -
       @@ -68,7 +73,7 @@ int init_unix(void)

     

       43
       43
       -
        	if(listen(s, 8) == -1) {

     

       44
       44
       -
        		logmsg(LOG_ERR, "listen failed: %s\n", strerror(errno));

     

       45
       45
       -
        		close(s);

     

       46
       46
       -
       -		unlink(SOCK_NAME);

     

       47
       47
       -
       +		unlink(sock_path);

     

       48
       48
       -
        		return -1;

     

       49
       49
       -
        	}

     

       50
       50
       -
        

     

       51
       51
       -
       @@ -82,7 +87,7 @@ void close_unix(void)

     

       52
       52
       -
        		close(lsock);

     

       53
       53
       -
        		lsock = -1;

     

       54
       54
       -
        

     

       55
       55
       -
       -		unlink(SOCK_NAME);

     

       56
       56
       -
       +		unlink(socket_path());

     

       57
       57
       -
        	}

     

       58
       58
       -
        }

     

       59
       59
       -
        

     

       60
       60
       -
       @@ -173,3 +178,19 @@ int handle_uevents(fd_set *rset)

     

       61
       61
       -
        

     

       62
       62
       -
        	return 0;

     

       63
       63
       -
        }

     

       64
       64
       -
       +

     

       65
       65
       -
       +char *socket_path(void)

     

       66
       66
       -
       +{

     

       67
       67
       -
       +	char *xdg_runtime_dir;

     

       68
       68
       -
       +	if((xdg_runtime_dir = getenv("XDG_RUNTIME_DIR"))) {

     

       69
       69
       -
       +		if ( spath == NULL ) {

     

       70
       70
       -
       +			spath = malloc(strlen(xdg_runtime_dir) + strlen("/spnav.sock") + 1);

     

       71
       71
       -
       +			if ( spath != NULL ) {

     

       72
       72
       -
       +				sprintf(spath, "%s/spnav.sock", xdg_runtime_dir);

     

       73
       73
       -
       +			}

     

       74
       74
       -
       +		};

     

       75
       75
       -
       +		return spath;

     

       76
       76
       -
       +	} else {

     

       77
       77
       -
       +		return DEFAULT_SOCK_NAME;

     

       78
       78
       -
       +	}

     

       79
       79
       -
       +}

     

       80
       80
       -
       diff --git a/src/proto_unix.h b/src/proto_unix.h

     

       81
       81
       -
       index 045b379..ec4509c 100644

     

       82
       82
       -
       --- a/src/proto_unix.h

     

       83
       83
       -
       +++ b/src/proto_unix.h

     

       84
       84
       -
       @@ -23,6 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

     

       85
       85
       -
        #include "event.h"

     

       86
       86
       -
        #include "client.h"

     

       87
       87
       -
        

     

       88
       88
       -
       +char *socket_path(void);

     

       89
       89
       -
        int init_unix(void);

     

       90
       90
       -
        void close_unix(void);

     

       91
       91
       -
        int get_unix_socket(void);

     

       92
       92
       -
       diff --git a/src/spnavd.c b/src/spnavd.c

     

       93
       93
       -
       index cbea191..03080da 100644

     

       94
       94
       -
       --- a/src/spnavd.c

     

       95
       95
       -
       +++ b/src/spnavd.c

     

       96
       96
       -
       @@ -344,7 +344,7 @@ static int find_running_daemon(void)

     

       97
       97
       -
        	}

     

       98
       98
       -
        	memset(&addr, 0, sizeof addr);

     

       99
       99
       -
        	addr.sun_family = AF_UNIX;

     

       100
       100
       -
       -	strncpy(addr.sun_path, SOCK_NAME, sizeof addr.sun_path);

     

       101
       101
       -
       +	strncpy(addr.sun_path, socket_path(), sizeof addr.sun_path);

     

       102
       102
       -
        

     

       103
       103
       -
        	if(connect(s, (struct sockaddr*)&addr, sizeof addr) == -1) {

     

       104
       104
       -
        		close(s);

     

       105
       105
       -
       diff --git a/src/spnavd.h b/src/spnavd.h

     

       106
       106
       -
       index fa0a916..deea4e0 100644

     

       107
       107
       -
       --- a/src/spnavd.h

     

       108
       108
       -
       +++ b/src/spnavd.h

     

       109
       109
       -
       @@ -26,7 +26,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

     

       110
       110
       -
        #define DEF_CFGFILE		"/etc/spnavrc"

     

       111
       111
       -
        #define DEF_LOGFILE		"/var/log/spnavd.log"

     

       112
       112
       -
        

     

       113
       113
       -
       -#define SOCK_NAME	"/var/run/spnav.sock"

     

       114
       114
       -
       +#define DEFAULT_SOCK_NAME	"/run/spnav.sock"

     

       115
       115
       -
       +#define SOCK_NAME_ENV	"SPNAVD_SOCK_LOCATION"

     

       116
       116
       -
        #define PIDFILE		"/var/run/spnavd.pid"

     

       117
       117
       -
        #define SYSLOG_ID	"spnavd"

     

       118
       118
       -

-6

pkgs/misc/drivers/spacenavd/default.nix

···

       13
       13
        
       

     

       14
       14
        
         buildInputs = [ libX11 ];

     

       15
       15
        
       

     

       16
       16
       -
         patches = [

     

       17
       17
       -
           # Changes the socket path from /run/spnav.sock to $XDG_RUNTIME_DIR/spnav.sock

     

       18
       18
       -
           # to allow for a user service

     

       19
       19
       -
           ./configure-socket-path.patch

     

       20
       20
       -
         ];

     

       21
       21
       -
       

     

       22
       16
        
         configureFlags = [ "--disable-debug"];

     

       23
       17
        
       

     

       24
       18
        
         meta = with lib; {

pkgs/top-level/all-packages.nix

···

       30074
       30074
        
       

     

       30075
       30075
        
         spacenav-cube-example = callPackage ../applications/misc/spacenav-cube-example { };

     

       30076
       30076
        
       

     

       30077
       30077
       +
         spnavcfg = callPackage ../applications/misc/spnavcfg { };

     

       30078
       30078
       +
       

     

       30077
       30079
        
         splix = callPackage ../misc/cups/drivers/splix { };

     

       30078
       30080
        
       

     

       30079
       30081
        
         steamcontroller = callPackage ../misc/drivers/steamcontroller { };