mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-13 09:13:17 +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.
17 lines
636 B
Diff
17 lines
636 B
Diff
Resolve messy situation with uintptr_t and stdint.h
|
|
|
|
Platforms common in nixpkgs will have stdint.h - thereby we avoid problems
|
|
that seem complicated to avoid. References:
|
|
https://gitlab.com/cmocka/cmocka/-/issues/38#note_1286565655
|
|
https://git.alpinelinux.org/aports/plain/main/cmocka/musl_uintptr.patch?id=6a15dd0d0ba9cc354a621fb359ca5e315ff2eabd
|
|
|
|
It isn't easy, as 1.1.6 codebase is missing stdint.h includes on many places,
|
|
and HAVE_UINTPTR_T from cmake also wouldn't get on all places it needs to.
|
|
--- a/include/cmocka.h
|
|
+++ b/include/cmocka.h
|
|
@@ -18,2 +18,4 @@
|
|
#define CMOCKA_H_
|
|
+#include <stdint.h>
|
|
+#define HAVE_UINTPTR_T 1
|
|
|