mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-29 18:33:00 +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.
14 lines
560 B
Diff
14 lines
560 B
Diff
--- a/src/Makefile
|
|
+++ b/src/Makefile
|
|
@@ -0,0 +1 @@
|
|
+CXX ?= g++
|
|
@@ -43 +44 @@ ${SHARED_LIB}: ${SHARED_OBJECTS}
|
|
- ${LD} ${LD_FLAGS} -Wl,${SONAMEPARAMETER},lib$(LIBRARY_NAME).so.$(SONAME) -o $@ ${SHARED_OBJECTS}
|
|
+ ${CXX} ${LD_FLAGS} -Wl,${SONAMEPARAMETER},lib$(LIBRARY_NAME).so.$(SONAME) -o $@ ${SHARED_OBJECTS}
|
|
@@ -52 +53 @@ ${SHARED_OBJECTS}:
|
|
- ${CPP} ${CPPFLAGS} -fpic -o $@ ${@:%.o=%.cpp}
|
|
+ ${CXX} ${CPPFLAGS} -fpic -o $@ ${@:%.o=%.cpp}
|
|
@@ -55 +56 @@ ${STATIC_OBJECTS}:
|
|
- ${CPP} ${CPPFLAGS} -o $@ ${@:%.s.o=%.cpp}
|
|
+ ${CXX} ${CPPFLAGS} -o $@ ${@:%.s.o=%.cpp}
|