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
415 B
Diff
18 lines
415 B
Diff
diff --git a/admin/Makefile.def b/admin/Makefile.def
|
|
index 0395d9d4f0..932d18f102 100644
|
|
--- a/admin/Makefile.def
|
|
+++ b/admin/Makefile.def
|
|
@@ -228,7 +228,11 @@ GLOBAL_DIRTY = $(builddir) *~ TAGS ChangeLog* Makefile.bak
|
|
# Fortran preprocessing
|
|
|
|
# Preprocessor command
|
|
-CPP = cpp
|
|
+ifdef GAG_CPP
|
|
+ CPP = $(GAG_CPP)
|
|
+else
|
|
+ CPP = cpp
|
|
+endif
|
|
|
|
# Preprocessor generic flags
|
|
GLOBAL_CPPFLAGS += -P -traditional -C
|