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

fmilibrary-vendor: fix vendor URL

Browse source
This commit is contained in:
Ben Wolsieffer 2020-02-04 21:08:38 -05:00
parent f0d16c56c6
commit b0c384c13a
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
distros/distro-overlay.nix
View file

@ -82,16 +82,19 @@ let
fake-localization = patchBoostSignals rosSuper.fake-localization;
fmilibrary-vendor = patchVendorUrl rosSuper.fmilibrary-vendor {
url = "https://jmodelica.org/fmil/FMILibrary-2.0.3-src.zip";
sha256 = "16lx6355zskrb7wgw2bzdzms36pcjyl2ry03wgsac5215jg1zhjc";
fmilibrary-vendor = patchVendorGit rosSuper.fmilibrary-vendor {
url = "https://github.com/modelon-community/fmi-library.git";
fetchgitArgs = {
rev = "2.1";
sha256 = "177rlw1ba1y0ahi8qfpg0sflh8mjdl6fmffwjg2a5vxyxwdwrjvh";
};
};
# This build system contains fractal levels of stupidity
foonathan-memory-vendor = patchVendorGit rosSuper.foonathan-memory-vendor {
url = "https://github.com/foonathan/memory.git";
sha256 = "1n7xxi61wzpixb3kldnl826syb4yml613q4i38d0cciydhy1gwzl";
fetchgitArgs = {
sha256 = "1n7xxi61wzpixb3kldnl826syb4yml613q4i38d0cciydhy1gwzl";
# Needed by the postFetch, then removed there
leaveDotGit = true;
# Prevent the build system from trying to download random files

4
lib/default.nix
View file

@ -17,7 +17,7 @@ with lib;
});
patchVendorGit = pkg: {
url, sha256,
url,
file ? "CMakeLists.txt",
fetchgitArgs ? {}
}: pkg.overrideAttrs ({
@ -25,7 +25,7 @@ with lib;
}: {
postPatch = ''
sed -i '\|GIT_REPOSITORY\s.*${escapeShellArg url}|c\
URL "${self.fetchgit ({ inherit url sha256; } // fetchgitArgs)}"' \
URL "${self.fetchgit ({ inherit url; } // fetchgitArgs)}"' \
'${file}'
'' + postPatch;
});