mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-02 03:43:06 +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.
32 lines
791 B
Diff
32 lines
791 B
Diff
From be08356f421825d3d2dd7ab687f86d9981a31f9a Mon Sep 17 00:00:00 2001
|
|
From: "Travis A. Everett" <travis.a.everett@gmail.com>
|
|
Date: Thu, 3 Aug 2023 20:15:40 -0500
|
|
Subject: [PATCH] simplify macOS builds
|
|
|
|
---
|
|
Makefile | 8 +-------
|
|
1 file changed, 1 insertion(+), 7 deletions(-)
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index 6dfd829..19c3ae3 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -8,13 +8,7 @@ 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)
|
|
EXEC = srt-vtt
|
|
-UNAME_S := $(shell uname -s)
|
|
-ifeq ($(UNAME_S), Darwin)
|
|
- BIN_DIR = bin/Mac-OSX
|
|
-else
|
|
- UNAME_M := $(shell uname -m)
|
|
- BIN_DIR = bin/$(UNAME_S)/$(UNAME_M)
|
|
-endif
|
|
+BIN_DIR = bin
|
|
EXEC_PATH = $(BIN_DIR)/$(EXEC)
|
|
|
|
.PHONY: test
|
|
--
|
|
2.39.0
|
|
|