parent
272a141fc1
commit
f170f48b60
|
@ -7,7 +7,7 @@
|
|||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
nimble.follows = "eris/nimble";
|
||||
nixpkgs.url = "github:ehmry/nixpkgs/sigil-21.11";
|
||||
nixpkgs.url = "github:ehmry/nixpkgs/sigil-23.05";
|
||||
};
|
||||
|
||||
nixConfig = {
|
||||
|
|
|
@ -82,12 +82,11 @@ in nullPkgs // {
|
|||
|
||||
erisPatchHook =
|
||||
final.buildPackages.nimPackages.callPackage ./eris-patch-hook {
|
||||
patchelf = prev.patchelf.overrideAttrs (attrs: {
|
||||
patches = attrs.patches or [ ] ++ [
|
||||
patchelf = prev.patchelf_0_13.overrideAttrs ({ patches ? [], ... }: {
|
||||
patches = patches ++ [
|
||||
./patchelf/dynstr.patch
|
||||
./patchelf/shiftFile.patch
|
||||
./patchelf/disable-assert.patch
|
||||
./patchelf/rpath.patch
|
||||
];
|
||||
});
|
||||
};
|
||||
|
|
|
@ -1,19 +0,0 @@
|
|||
commit 32003f90f7eb0d685913cf49a05f32f3125855b0
|
||||
Author: Emery Hemingway <ehmry@posteo.net>
|
||||
Date: 2022-05-18 20:17:03 -0500
|
||||
|
||||
Fix replacement of empty rpath with an empty rpath
|
||||
|
||||
diff --git a/src/patchelf.cc b/src/patchelf.cc
|
||||
index fd1e7b7..b9f58cd 100644
|
||||
--- a/src/patchelf.cc
|
||||
+++ b/src/patchelf.cc
|
||||
@@ -1426,7 +1426,7 @@ void ElfFile<ElfFileParamNames>::modifyRPath(RPathOp op,
|
||||
|
||||
|
||||
if (newRPath.size() <= rpathSize) {
|
||||
- strcpy(rpath, newRPath.c_str());
|
||||
+ if (rpath) strcpy(rpath, newRPath.c_str());
|
||||
return;
|
||||
}
|
||||
|
Loading…
Reference in New Issue