mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-09 06:23:36 +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.
27 lines
758 B
Diff
27 lines
758 B
Diff
diff --git a/common/include/lib.mak.in b/common/include/lib.mak.in
|
|
index 3afbb14..b8df9d9 100644
|
|
--- a/common/include/lib.mak.in
|
|
+++ b/common/include/lib.mak.in
|
|
@@ -22,7 +22,7 @@ static: $(STATIC_LIB)
|
|
shared: $(SHARED_LIB)
|
|
|
|
$(STATIC_LIB): $(OBJECTS)
|
|
- ar rcs $(STATIC_LIB) $(OBJECTS)
|
|
+ $(AR) rcs $(STATIC_LIB) $(OBJECTS)
|
|
|
|
$(SHARED_LIB): $(OBJECTS)
|
|
$(CC) -shared -Wl,-soname,$(SO_NAME) $(LDFLAGS) -o $(SHARED_LIB) \
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 82ca3e1..0a78283 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -15,6 +15,8 @@ if test "$YACC" != "bison -y"; then
|
|
AC_MSG_ERROR([bison not found])
|
|
fi
|
|
|
|
+AC_CHECK_TOOL([AR], [ar], [:])
|
|
+
|
|
AC_ARG_WITH(
|
|
[python],
|
|
[AS_HELP_STRING([--without-python],[compile without python support])],
|