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

Attempt fix with autoelfpatch

Browse Source
This commit is contained in:
Nicolas Hiillos
2023-10-24 16:33:26 +03:00
parent b8a72302e2
commit fc66a0d989
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,17 +13,28 @@ stdenv.mkDerivation rec {
sha256 = "SjFkcNl/4AlsMeIw5Hg9Kp5mIIV9KFUYodXV6lAi3/A="; sha256 = "SjFkcNl/4AlsMeIw5Hg9Kp5mIIV9KFUYodXV6lAi3/A=";
}; };
nativeBuildInputs = with pkgs; [ which expat ]; nativeBuildInputs = with pkgs; [
autoPatchelfHook
which
expat
];
buildInputs = [ linuxcnc ethercat ]; buildInputs = [ linuxcnc ethercat ];
preBuild = ''
#addAutoPatchelfSearchPath ${placeholder "out"}/lib/linuxcnc/modules/
'';
installFlags = [ installFlags = [
"prefix=${placeholder "out"}"
#"RUN_IN_PLACE=YES"
"DESTDIR=${placeholder "out"}" "DESTDIR=${placeholder "out"}"
"EMC2_HOME=''" "EMC2_HOME=''"
"LIBDIR=''" "LIBDIR=''"
"RTLIBDIR='/lib/linuxcnc/modules'" "RTLIBDIR='/lib/linuxcnc/modules'"
]; ];
meta = with lib; { meta = with lib; {
description = "LinuxCNC ethercat interop"; description = "LinuxCNC ethercat interop";
platforms = platforms.linux; platforms = platforms.linux;

3
packages/linuxcnc/default.nix
View File

@@ -1,4 +1,4 @@
{ lib, stdenv, autoreconfHook, wrapGAppsHook, qt5, makeWrapper, fetchFromGitHub, libtool, pkgconfig, { pkgs, lib, stdenv, autoreconfHook, wrapGAppsHook, qt5, makeWrapper, fetchFromGitHub, libtool, pkgconfig,
readline_5, ncurses, libtirpc, systemd, libmodbus, libusb, glib, gtk2, gtk3, procps, kmod, sysctl, 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, 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
@@ -36,6 +36,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
autoreconfHook autoreconfHook
pkgs.autoPatchelfHook
makeWrapper makeWrapper
wrapGAppsHook wrapGAppsHook
qt5.wrapQtAppsHook qt5.wrapQtAppsHook