mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-16 01:45:11 +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
974 B
Diff
26 lines
974 B
Diff
Manually tell the compiler that strlcpy exists. The `try-build` function seems
|
|
somewhat broken, i.e. any code that I try to pass to it doesn't link because of an
|
|
"undefined reference to main" error (and some more quoting issues with newlines being
|
|
swalloed).
|
|
|
|
Because both musl and glibc seemt o support strlcpy nowadays, I decided to just skip the
|
|
possibly broken feature-check and hardcode that it exists.
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index ed2414b..37be9cd 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -239,10 +239,8 @@ endif
|
|
# On a given system, some libs may link statically, some may not; so, check
|
|
# both and only build those that link!
|
|
|
|
-ifeq ($(call try-build,$(SOURCE_STRLCPY),$(CFLAGS),$(LDFLAGS)),y)
|
|
- CFLAGS_DYNOPT += -DHAVE_STRLCPY
|
|
- CFLAGS_STATOPT += -DHAVE_STRLCPY
|
|
-endif
|
|
+CFLAGS_DYNOPT += -DHAVE_STRLCPY
|
|
+CFLAGS_STATOPT += -DHAVE_STRLCPY
|
|
|
|
ifeq ($(call try-build,$(SOURCE_BFD),$(CFLAGS),$(LDFLAGS) -lbfd -static),y)
|
|
CFLAGS_STATOPT += -DCONFIG_HAS_BFD
|