Mostly fix build

This commit is contained in:
2023-08-22 16:14:19 +03:00
parent 05869fccfa
commit 237a9866c5

View File

@@ -29,38 +29,40 @@
#propagatedBuildInputs = [ flask ]; #propagatedBuildInputs = [ flask ];
src = yapps-src; src = yapps-src;
}; };
pangocffi = pkgs.python3Packages.buildPythonApplication { #pangocffi = pkgs.python3Packages.buildPythonApplication {
pname = "pangocffi"; # pname = "pangocffi";
version = "1.0"; # version = "1.0";
nativeBuildInputs = [ # nativeBuildInputs = [
pkgs.pkg-config # pkgs.pkg-config
pkgs.libffi # pkgs.libffi
pkgs.pango.dev # pkgs.pango.dev
pkgs.glib # pkgs.glib
pkgs.python3Packages.setuptools # pkgs.python3Packages.setuptools
]; # ];
propagatedBuildInputs = with pkgs.python3Packages; [ # propagatedBuildInputs = with pkgs.python3Packages; [
cffi # cffi
pytest # pytest
setuptools # setuptools
flake8 # flake8
pytest # pytest
coverage # coverage
sphinx # sphinx
sphinx_rtd_theme # sphinx_rtd_theme
tox # tox
twine # twine
]; # ];
src = pangocffi-src; # src = pangocffi-src;
setuptoolsCheckPhase = '' # setuptoolsCheckPhase = ''
echo "SKIPPING setuptoolsCheckPhase" # echo "SKIPPING setuptoolsCheckPhase"
''; # '';
}; #};
#boostPython = pkgs.boost174.override { python = pkgs.python3; enablePython = true; }; #boostPython = pkgs.boost174.override { python = pkgs.python3; enablePython = true; };
boostPython = pkgs.boost174.override { enablePython = true; }; #boostPython = pkgs.boost16x.override { enablePython = true; };
boostPython = pkgs.boost.override { python = pkgs.python3; enablePython = true; };
kernel = pkgs.linux_latest;
linuxcnc = pkgs.stdenv.mkDerivation { linuxcnc = pkgs.stdenv.mkDerivation {
# https://linuxcnc.org/docs/devel/html/code/building-linuxcnc.html # https://linuxcnc.org/docs/devel/html/code/building-linuxcnc.html
@@ -76,17 +78,33 @@
#''; #'';
preAutoreconf = '' preAutoreconf = ''
cd src cd src
substituteInPlace configure.ac --replace "LOCALEDIR='/usr/share/locale'" "LOCALEDIR='${placeholder "out"}/locale'"
''; '';
configureFlags = [ configureFlags = [
"KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
#"--with-linux-dir=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
#"LOCALEDIR=${placeholder "out"}"
"--with-realtime=uspace" "--with-realtime=uspace"
"--enable-non-distributable=yes" "--enable-non-distributable=yes"
"--with-tclConfig=${pkgs.tcl}/lib/tclConfig.sh" "--with-tclConfig=${pkgs.tcl}/lib/tclConfig.sh"
"--with-tkConfig=${pkgs.tk}/lib/tkConfig.sh" "--with-tkConfig=${pkgs.tk}/lib/tkConfig.sh"
"--with-boost-python=boost_python310"
#"--with-boost-python=${boostPython.dev}/include/boost/" #"--with-boost-python=${boostPython.dev}/include/boost/"
#"--with-boost-python=${boostPython}/lib/libboost_python310.so"
#"PYTHON_LDFLAGS=-L${pkgs.python39Packages.python}/lib" #"PYTHON_LDFLAGS=-L${pkgs.python39Packages.python}/lib"
]; ];
preInstall = ''
substituteInPlace Makefile --replace 'chown' '#chown'
'';
installFlags = [
"INSTALL=install"
#"DESTDIR=${placeholder "out"}"
"SETUID=install"
];
nativeBuildInputs = with pkgs; [ nativeBuildInputs = with pkgs; [
autoreconfHook autoreconfHook
pkg-config pkg-config
@@ -94,7 +112,14 @@
gobject-introspection gobject-introspection
]; ];
#nativeBuildInputs = [ pkgs.pkg-config ]; #nativeBuildInputs = [ pkgs.pkg-config ];
postInstall = ''
ls $out/bin
substituteInPlace $out/bin/linuxcnc --replace 'wish' '${pkgs.tk}/bin/wish'
'';
buildInputs = with pkgs; [ buildInputs = with pkgs; [
(python3.withPackages
(ps: with ps; [ boostPython ]))
libtirpc libtirpc
udev udev
libmodbus libmodbus
@@ -117,7 +142,7 @@
tcl tcl
tclx tclx
tk.dev tk
tkimg tkimg
bwidget bwidget
@@ -133,7 +158,10 @@
ps ps
sysvtools sysvtools
util-linux util-linux
gettext
asciidoc
libepoxy
#tclreadline #tclreadline
#pkgs.python3Packages.pygobject3.dev #pkgs.python3Packages.pygobject3.dev
#pkgs.python3Packages.gst-python #pkgs.python3Packages.gst-python