mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-09 22:45:08 +00:00
571c71e6f7
We are migrating packages that meet below requirements:
1. using `callPackage`
2. called path is a directory
3. overriding set is empty (`{ }`)
4. not containing path expressions other than relative path (to
makenixpkgs-vet happy)
5. not referenced by nix files outside of the directory, other
than`pkgs/top-level/all-packages.nix`
6. not referencing nix files outside of the directory
7. not referencing `default.nix` (since it's changed to `package.nix`)
8. `outPath` doesn't change after migration
The tool is here: https://github.com/Aleksanaa/by-name-migrate.
26 lines
770 B
Diff
26 lines
770 B
Diff
diff --git a/test/loader.c b/test/loader.c
|
|
index 4e3dfdc..7f98d94 100644
|
|
--- a/test/loader.c
|
|
+++ b/test/loader.c
|
|
@@ -54,20 +54,6 @@ int main(int argc, char **argv)
|
|
assert(ret < 0);
|
|
ret = ld_find_library(maps, mapnum, "libc", false, NULL, 6);
|
|
assert(ret >= 0);
|
|
-#if __WORDSIZE == 64
|
|
- ret = ld_find_library(maps, mapnum, "/lib64/ld-linux-x86-64.so.2",
|
|
- true, NULL, 6);
|
|
- assert(ret >= 0);
|
|
- ret = ld_find_library(maps, mapnum, "/lib/ld-linux-x86-64.so.2",
|
|
- false, NULL, 6);
|
|
-#else
|
|
- ret = ld_find_library(maps, mapnum, "/lib/ld-linux.so.2",
|
|
- true, NULL, 6);
|
|
- assert(ret >= 0);
|
|
- ret = ld_find_library(maps, mapnum, "/lib32/ld-linux.so.2",
|
|
- false, NULL, 6);
|
|
-#endif
|
|
- assert(ret < 0);
|
|
ld_free_maps(maps, mapnum);
|
|
return 0;
|
|
}
|