nic/linuxcnc-nix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename packages

Browse Source
This commit is contained in:
Nicolas Hiillos
2023-10-23 15:17:17 +03:00
parent 4c561b1288
commit de989d4af8
7 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/linuxcnc.nix
View File

@@ -1,12 +1,12 @@
{ config, lib, pkgs, ... }:
let
cfg = config.local.packages.linuxcnc-base;
cfg = config.local.packages.linuxcnc;
inherit (builtins) filter map pathExists listToAttrs;
in {
options.local.packages.linuxcnc.enable = lib.mkEnableOption "Enable linuxcnc";
config = lib.mkIf cfg.enable {
environment.systemPackages = with pkgs; [ linuxcnc-with-ethercat ];
environment.systemPackages = with pkgs; [ linuxcnc ];
security.wrappers = listToAttrs (map (f: {
name = f;
@@ -14,8 +14,8 @@ in {
setuid = true;
owner = "root";
group = "root";
source = "${pkgs.linuxcnc-with-ethercat}/bin/${f}-nosetuid";
source = "${pkgs.linuxcnc}/bin/${f}-nosetuid";
};
}) (filter (f: pathExists "${pkgs.linuxcnc-with-ethercat}/bin/${f}-nosetuid") pkgs.linuxcnc-with-ethercat.setuidApps));
}) (filter (f: pathExists "${pkgs.linuxcnc}/bin/${f}-nosetuid") pkgs.linuxcnc.setuidApps));
};
}

6
packages/linuxcnc-with-ethercat/default.nix → packages/linuxcnc-base/default.nix
View File

@@ -1,8 +1,7 @@
{ lib, stdenv, autoreconfHook, wrapGAppsHook, qt5, makeWrapper, fetchFromGitHub, libtool, pkgconfig,
readline_5, ncurses, libtirpc, systemd, libmodbus, libusb, glib, gtk2, gtk3, procps, kmod, sysctl,
util-linux, psmisc, intltool, tcl, tk, bwidget, tkimg, tclx, tkblt, pango, cairo, boost, espeak, gst_all_1,
python3Full, yapps, gobject-introspection, libGLU, xorg, libepoxy, hicolor-icon-theme, glxinfo, bash,
hal-cia402, linuxcnc-ethercat
python3Full, yapps, gobject-introspection, libGLU, xorg, libepoxy, hicolor-icon-theme, glxinfo, bash
}:
let
pythonPkg = (python3Full.withPackages (ps: [
@@ -24,7 +23,7 @@ in
stdenv.mkDerivation rec {
hardeningDisable = [ "all" ];
enableParallelBuilding = true;
pname = "linuxcnc";
pname = "linuxcnc-base";
version = "2.9-git";
name = "${pname}-${version}";
@@ -51,7 +50,6 @@ stdenv.mkDerivation rec {
psmisc intltool tcl tk bwidget tkimg tclx tkblt pango cairo pythonPkg.pkgs.pygobject3 gobject-introspection
boost_python pythonPkg.pkgs.boost pythonPkg qt5.qtbase espeak gst_all_1.gstreamer
ncurses readline_5 libGLU xorg.libXmu libepoxy hicolor-icon-theme glxinfo
hal-cia402 linuxcnc-ethercat
];
preAutoreconf = ''

0
packages/linuxcnc-with-ethercat/fix_make.patch → packages/linuxcnc-base/fix_make.patch
View File

0
packages/linuxcnc-with-ethercat/pncconf_paths.patch → packages/linuxcnc-base/pncconf_paths.patch
View File

0
packages/linuxcnc-with-ethercat/rtapi_app_setuid.patch → packages/linuxcnc-base/rtapi_app_setuid.patch
View File

4
packages/linuxcnc-ethercat/default.nix
View File

@@ -1,4 +1,4 @@
{ config, lib, pkgs, stdenv, linuxcnc, etherlab }:
{ config, lib, pkgs, stdenv, linuxcnc-base, etherlab }:
stdenv.mkDerivation rec {
enableParallelBuilding = true;
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = with pkgs; [ which expat ];
buildInputs = [ linuxcnc etherlab.ethercat ];
buildInputs = [ linuxcnc-base etherlab.ethercat ];
installFlags = [ "DESTDIR=${placeholder "out"}" ];

6
packages/linuxcnc/default.nix
View File

@@ -1,7 +1,8 @@
{ lib, stdenv, autoreconfHook, wrapGAppsHook, qt5, makeWrapper, fetchFromGitHub, libtool, pkgconfig,
readline_5, ncurses, libtirpc, systemd, libmodbus, libusb, glib, gtk2, gtk3, procps, kmod, sysctl,
util-linux, psmisc, intltool, tcl, tk, bwidget, tkimg, tclx, tkblt, pango, cairo, boost, espeak, gst_all_1,
python3Full, yapps, gobject-introspection, libGLU, xorg, libepoxy, hicolor-icon-theme, glxinfo, bash
python3Full, yapps, gobject-introspection, libGLU, xorg, libepoxy, hicolor-icon-theme, glxinfo, bash,
hal-cia402, linuxcnc-ethercat
}:
let
pythonPkg = (python3Full.withPackages (ps: [
@@ -23,7 +24,7 @@ in
stdenv.mkDerivation rec {
hardeningDisable = [ "all" ];
enableParallelBuilding = true;
pname = "linuxcnc-base";
pname = "linuxcnc";
version = "2.9-git";
name = "${pname}-${version}";
@@ -50,6 +51,7 @@ stdenv.mkDerivation rec {
psmisc intltool tcl tk bwidget tkimg tclx tkblt pango cairo pythonPkg.pkgs.pygobject3 gobject-introspection
boost_python pythonPkg.pkgs.boost pythonPkg qt5.qtbase espeak gst_all_1.gstreamer
ncurses readline_5 libGLU xorg.libXmu libepoxy hicolor-icon-theme glxinfo
hal-cia402 linuxcnc-ethercat
];
preAutoreconf = ''