mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-28 16:43:58 +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
320 B
Diff
14 lines
320 B
Diff
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -1,9 +1,4 @@
|
|
-ERR = $(shell which clang++ >/dev/null; echo $$?)
|
|
-ifeq "$(ERR)" "0"
|
|
- CXX ?= clang++
|
|
-else
|
|
- CXX ?= g++
|
|
-endif
|
|
+CXX ?= g++
|
|
CXXFLAGS = -std=c++11 -O2 -MMD -I ./deps
|
|
OBJECTS := src/text_encoding_detect.o src/Utils.o src/Converter.o src/main.o
|
|
DEPENDS := $(OBJECTS:.o=.d)
|