movefasta/nix-ros-overlay
1
0
Fork 0
mirror of https://github.com/lopsided98/nix-ros-overlay.git synced 2025-06-12 02:34:50 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

iceoryx-posh: use cpptoml from nixpkgs

Browse source
This commit is contained in:
Ben Wolsieffer 2024-07-06 10:50:04 -04:00
parent 4e8f44c813
commit 68f03ce770
5 changed files with 17 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

19
distros/humble/overrides.nix
View file

@ -39,25 +39,6 @@ in with lib; {
];
});
iceoryx-posh = (patchExternalProjectGit rosSuper.iceoryx-posh {
url = "https://github.com/skystrife/cpptoml.git";
file = "cmake/cpptoml/cpptoml.cmake.in";
fetchgitArgs = {
rev = "v0.1.1";
sha256 = "0gxzzi4xbjszzlvmzaniayrd190kag1pmkn1h384s80cvqphbr00";
};
}).overrideAttrs ({
patches ? [], ...
}: {
patches = patches ++ [
(self.fetchpatch {
url = "https://github.com/eclipse-iceoryx/iceoryx/commit/d4519632964794553791ef3f951ed47ca52ebbb6.patch";
hash = "sha256-f4kITUql8uFSptFmu7LZGChlfDG63b0gmsRyHp1NsWw=";
stripLen = 1;
})
];
});
libphidget22 = patchVendorUrl rosSuper.libphidget22 {
url = "https://www.phidgets.com/downloads/phidget22/libraries/linux/libphidget22/libphidget22-1.19.20240304.tar.gz";
hash = "sha256-GpzGMpQ02s/X/XEcGoozzMjigrbqvAu81bcb7QG+36E=";

19
distros/iron/overrides.nix
View file

@ -39,25 +39,6 @@ in with lib; {
];
});
iceoryx-posh = (patchExternalProjectGit rosSuper.iceoryx-posh {
url = "https://github.com/skystrife/cpptoml.git";
file = "cmake/cpptoml/cpptoml.cmake.in";
fetchgitArgs = {
rev = "v0.1.1";
sha256 = "0gxzzi4xbjszzlvmzaniayrd190kag1pmkn1h384s80cvqphbr00";
};
}).overrideAttrs ({
patches ? [], ...
}: {
patches = patches ++ [
(self.fetchpatch {
url = "https://github.com/eclipse-iceoryx/iceoryx/commit/d4519632964794553791ef3f951ed47ca52ebbb6.patch";
hash = "sha256-f4kITUql8uFSptFmu7LZGChlfDG63b0gmsRyHp1NsWw=";
stripLen = 1;
})
];
});
libphidget22 = patchVendorUrl rosSuper.libphidget22 {
url = "https://www.phidgets.com/downloads/phidget22/libraries/linux/libphidget22/libphidget22-1.19.20240304.tar.gz";
hash = "sha256-GpzGMpQ02s/X/XEcGoozzMjigrbqvAu81bcb7QG+36E=";

19
distros/jazzy/overrides.nix
View file

@ -39,25 +39,6 @@ in {
];
});
iceoryx-posh = (lib.patchExternalProjectGit rosSuper.iceoryx-posh {
url = "https://github.com/skystrife/cpptoml.git";
file = "cmake/cpptoml/cpptoml.cmake.in";
fetchgitArgs = {
rev = "v0.1.1";
sha256 = "0gxzzi4xbjszzlvmzaniayrd190kag1pmkn1h384s80cvqphbr00";
};
}).overrideAttrs ({
patches ? [], ...
}: {
patches = patches ++ [
(self.fetchpatch {
url = "https://github.com/eclipse-iceoryx/iceoryx/commit/d4519632964794553791ef3f951ed47ca52ebbb6.patch";
hash = "sha256-f4kITUql8uFSptFmu7LZGChlfDG63b0gmsRyHp1NsWw=";
stripLen = 1;
})
];
});
lely-core-libraries = lib.patchExternalProjectGit rosSuper.lely-core-libraries {
url = "https://gitlab.com/lely_industries/lely-core.git";
fetchgitArgs = {

19
distros/rolling/overrides.nix
View file

@ -39,25 +39,6 @@ in {
];
});
iceoryx-posh = (lib.patchExternalProjectGit rosSuper.iceoryx-posh {
url = "https://github.com/skystrife/cpptoml.git";
file = "cmake/cpptoml/cpptoml.cmake.in";
fetchgitArgs = {
rev = "v0.1.1";
sha256 = "0gxzzi4xbjszzlvmzaniayrd190kag1pmkn1h384s80cvqphbr00";
};
}).overrideAttrs ({
patches ? [], ...
}: {
patches = patches ++ [
(self.fetchpatch {
url = "https://github.com/eclipse-iceoryx/iceoryx/commit/d4519632964794553791ef3f951ed47ca52ebbb6.patch";
hash = "sha256-f4kITUql8uFSptFmu7LZGChlfDG63b0gmsRyHp1NsWw=";
stripLen = 1;
})
];
});
lely-core-libraries = lib.patchExternalProjectGit rosSuper.lely-core-libraries {
url = "https://gitlab.com/lely_industries/lely-core.git";
fetchgitArgs = {

17
distros/ros2-overlay.nix
View file

@ -65,6 +65,23 @@ rosSelf: rosSuper: with rosSelf.lib; {
nativeBuildInputs = nativeBuildInputs ++ [ self.buildPackages.cmake ];
});
iceoryx-posh = rosSuper.iceoryx-posh.overrideAttrs ({
patches ? [],
buildInputs ? [],
cmakeFlags ? [], ...
}: {
patches = patches ++ [
(self.fetchpatch {
url = "https://github.com/eclipse-iceoryx/iceoryx/commit/d4519632964794553791ef3f951ed47ca52ebbb6.patch";
hash = "sha256-f4kITUql8uFSptFmu7LZGChlfDG63b0gmsRyHp1NsWw=";
stripLen = 1;
})
];
buildInputs = buildInputs ++ [ self.cpptoml ];
cmakeFlags = cmakeFlags ++ [ "-DDOWNLOAD_TOML_LIB=OFF" ];
});
librealsense2 = rosSuper.librealsense2.overrideAttrs ({
patches ? [], ...
}: {