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

Compare commits

base: nic:6650d64114d784158969b7eca5c471d231447aeb
Branches Tags
nic:master
..
compare: nic:26d56219c257d13fcab7d5b0fa262a01371e3a49
Branches Tags
nic:master

3 Commits
6650d64114 ... 26d56219c2

Author SHA1 Message Date
Nicolas Hiillos
26d56219c2 Paralell -> Parallel 2023-09-27 18:56:37 +03:00
Nicolas Hiillos
3205f2d806 Clean up 2023-09-27 18:55:57 +03:00
Nicolas Hiillos
b2a8cf8177 Fix cia402 2023-09-27 18:54:21 +03:00
3 changed files with 10 additions and 5 deletions
Expand all files Collapse all files

11
packages/hal-cia402/default.nix
View File

@@ -1,7 +1,7 @@
{ config, lib, pkgs, stdenv, linuxcnc }: { config, lib, pkgs, stdenv, linuxcnc }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
enableParalellBuilding = true; enableParallelBuilding = true;
pname = "hal-cia402"; pname = "hal-cia402";
version = "e772757686"; version = "e772757686";
@@ -10,14 +10,19 @@ stdenv.mkDerivation rec {
src = pkgs.fetchgit { src = pkgs.fetchgit {
url = "https://git.dripco.eu/nic/hal-cia402.git"; url = "https://git.dripco.eu/nic/hal-cia402.git";
rev = "e772757686a0fbee476b3d03c060e5cc9ee90e27"; rev = "e772757686a0fbee476b3d03c060e5cc9ee90e27";
sha256 = "SjFkcNl/4AlsMeIw5Hg9Kp5mIIV9KFUYodXV6lAi3/A="; sha256 = "qna8a1C/WXNudyRXxibTGai3D48nRWRyprlXZYM2rxg=";
}; };
nativeBuildInputs = with pkgs; [ ]; nativeBuildInputs = with pkgs; [ ];
buildInputs = [ linuxcnc ]; buildInputs = [ linuxcnc ];
#installFlags = [ "DESTDIR=${placeholder "out"}" ]; installPhase = ''
halcompile --compile cia402.comp
mkdir -p $out/lib/linuxcnc/modules/
cp cia402.so $out/lib/linuxcnc/modules/
'';
meta = with lib; { meta = with lib; {
description = "LinuxCNC CIA402 HAL component"; description = "LinuxCNC CIA402 HAL component";

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

@@ -1,7 +1,7 @@
{ config, lib, pkgs, stdenv, linuxcnc, etherlab }: { config, lib, pkgs, stdenv, linuxcnc, etherlab }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
enableParalellBuilding = true; enableParallelBuilding = true;
pname = "linuxcnc-ethercat"; pname = "linuxcnc-ethercat";
version = "5ad53da25b"; version = "5ad53da25b";

2
packages/linuxcnc/default.nix
View File

@@ -22,7 +22,7 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
hardeningDisable = [ "all" ]; hardeningDisable = [ "all" ];
enableParalellBuilding = true; enableParallelBuilding = true;
pname = "linuxcnc"; pname = "linuxcnc";
version = "2.9-git"; version = "2.9-git";
name = "${pname}-${version}"; name = "${pname}-${version}";