mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 07:53:19 +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.
20 lines
834 B
Diff
20 lines
834 B
Diff
diff --git a/configure.ac b/configure.ac
|
|
index 3ad983d..ff8ff96 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -476,13 +476,7 @@ AS_IF([echo "$protobuf_LIBS" | grep -q -- -pthread],
|
|
|
|
# Bash completion needs to ask where it goes if >= 2.0 is installed.
|
|
AS_IF([test "$install_completion" != no],
|
|
- [PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0],
|
|
- [if test "$prefix" = "NONE"; then
|
|
- completions="`pkg-config --variable=completionsdir bash-completion`"
|
|
- else
|
|
- completions="`pkg-config --define-variable=prefix=$prefix --variable=completionsdir bash-completion`"
|
|
- fi],
|
|
- [completions="${sysconfdir}/bash_completion.d"])
|
|
+ [completions="`pkg-config --define-variable=datadir=$datadir --variable=completionsdir bash-completion`"]
|
|
AC_SUBST([completions])])
|
|
|
|
AC_CONFIG_FILES([
|