mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-28 00:24:18 +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.
28 lines
1.0 KiB
Diff
28 lines
1.0 KiB
Diff
diff --git a/Makefile b/Makefile
|
|
index 2304a21..697ccd4 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -149,13 +149,11 @@ libfsverity.so.$(SOVERSION):$(SHARED_LIB_OBJ)
|
|
$(QUIET_CCLD) $(CC) -o $@ -Wl,-soname=$@ -shared $+ \
|
|
$(CFLAGS) $(LDFLAGS) $(LDLIBS)
|
|
|
|
-DEFAULT_TARGETS += libfsverity.so.$(SOVERSION)
|
|
|
|
# Create the symlink libfsverity.so => libfsverity.so.$(SOVERSION)
|
|
libfsverity.so:libfsverity.so.$(SOVERSION)
|
|
$(QUIET_LN) ln -sf $+ $@
|
|
|
|
-DEFAULT_TARGETS += libfsverity.so
|
|
|
|
##############################################################################
|
|
|
|
@@ -263,8 +261,6 @@ install:all
|
|
install -d $(DESTDIR)$(LIBDIR)/pkgconfig $(DESTDIR)$(INCDIR) $(DESTDIR)$(BINDIR)
|
|
install -m755 $(FSVERITY) $(DESTDIR)$(BINDIR)
|
|
install -m644 libfsverity.a $(DESTDIR)$(LIBDIR)
|
|
- install -m755 libfsverity.so.$(SOVERSION) $(DESTDIR)$(LIBDIR)
|
|
- ln -sf libfsverity.so.$(SOVERSION) $(DESTDIR)$(LIBDIR)/libfsverity.so
|
|
install -m644 include/libfsverity.h $(DESTDIR)$(INCDIR)
|
|
sed -e "s|@PREFIX@|$(PREFIX)|" \
|
|
-e "s|@LIBDIR@|$(LIBDIR)|" \
|