mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-26 08:53:21 +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.
60 lines
2.1 KiB
Diff
60 lines
2.1 KiB
Diff
From 9ef90b958b7ae50aeeb5c269468034d73d6e2efe Mon Sep 17 00:00:00 2001
|
|
From: Aleksey Kravchenko <rhash.admin@gmail.com>
|
|
Date: Mon, 31 Jul 2023 02:48:15 +0300
|
|
Subject: [PATCH] Fix #238: Build on *BSD
|
|
|
|
---
|
|
configure | 3 ++-
|
|
librhash/Makefile | 8 ++++----
|
|
2 files changed, 6 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/configure b/configure
|
|
index dae76d5..39ef8c1 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -567,6 +567,7 @@ qnx() { test "$OS_LC" = "qnx"; }
|
|
sunos() { test "$OS_LC" = "sunos"; }
|
|
wine() { test "$OS_LC" = "wine"; }
|
|
win32() { cygwin || mingw32 || mingw64 || msys || wine; }
|
|
+bsd() { dragonfly || freebsd || netbsd || openbsd ; }
|
|
posix_make() { aix || bsdos || hpux || irix || qnx || sunos; }
|
|
|
|
#####################################################################
|
|
@@ -713,7 +714,7 @@ if win32; then
|
|
elif darwin; then
|
|
SHARED_EXT=".${RHASH_VERSION_MAJOR}.dylib"
|
|
SOLINK_EXT=".dylib"
|
|
-elif linux; then
|
|
+elif linux || bsd; then
|
|
# use the full library version for the library file extension
|
|
SHARED_EXT=".so.${RHASH_VERSION}"
|
|
fi
|
|
diff --git a/librhash/Makefile b/librhash/Makefile
|
|
index d48e06e..e8ee862 100644
|
|
--- a/librhash/Makefile
|
|
+++ b/librhash/Makefile
|
|
@@ -27,9 +27,9 @@ install-lib-static: $(LIBRHASH_STATIC)
|
|
install-lib-shared: $(LIBRHASH_SHARED) $(EXTRA_INSTALL_LIBSHARED)
|
|
$(INSTALL) -d $(SO_DIR)
|
|
$(INSTALL_SHARED) $(LIBRHASH_SHARED) $(SO_DIR)/
|
|
- test "x$(LIBRHASH_SO_MAJ)" != "x$(LIBRHASH_SHARED)" && \
|
|
+ test "x$(LIBRHASH_SO_MAJ)" != "x$(LIBRHASH_SHARED)" || ( \
|
|
rm -f $(LIBDIR)/$(LIBRHASH_SO_MAJ) && \
|
|
- ln -s $(LIBRHASH_SHARED) $(LIBDIR)/$(LIBRHASH_SO_MAJ)
|
|
+ ln -s $(LIBRHASH_SHARED) $(LIBDIR)/$(LIBRHASH_SO_MAJ) )
|
|
|
|
install-implib:
|
|
$(INSTALL) -d $(LIBDIR)
|
|
@@ -175,9 +175,9 @@ $(EXPORTS_FILE): $(LIB_HEADERS)
|
|
$(LIB_HEADERS) | grep -v "$(EXPORTS_SKIP)" > $@
|
|
|
|
$(LIBRHASH_SOLINK):
|
|
- test "x$(LIBRHASH_SO_MAJ)" != "x$(LIBRHASH_SHARED)" && \
|
|
+ test "x$(LIBRHASH_SO_MAJ)" = "x$(LIBRHASH_SHARED)" || ( \
|
|
rm -f $(LIBRHASH_SO_MAJ) && \
|
|
- ln -s $(LIBRHASH_SHARED) $(LIBRHASH_SO_MAJ)
|
|
+ ln -s $(LIBRHASH_SHARED) $(LIBRHASH_SO_MAJ) )
|
|
rm -f $(LIBRHASH_SOLINK)
|
|
ln -s $(LIBRHASH_SO_MAJ) $(LIBRHASH_SOLINK)
|
|
|