mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-09 14:33:22 +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.
18 lines
519 B
Diff
18 lines
519 B
Diff
diff --git a/main.c b/main.c
|
|
index b61ca34..5a420c2 100644
|
|
--- a/main.c
|
|
+++ b/main.c
|
|
@@ -602,10 +602,10 @@ main (int argc, char **argv)
|
|
else
|
|
disable_private_libs();
|
|
|
|
- /* honor Requires.private if any Cflags are requested or any static
|
|
+ /* honor Requires.private if any any static
|
|
* libs are requested */
|
|
|
|
- if (pkg_flags & CFLAGS_ANY || want_requires_private || want_exists ||
|
|
+ if (want_requires_private ||
|
|
(want_static_lib_list && (pkg_flags & LIBS_ANY)))
|
|
enable_requires_private();
|
|
|