mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-26 23:54:01 +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
553 B
Diff
14 lines
553 B
Diff
diff --git a/Makefile.inc b/Makefile.inc
|
|
index 424d7b2e4..87934fee0 100644
|
|
--- a/Makefile.inc
|
|
+++ b/Makefile.inc
|
|
@@ -918,7 +918,7 @@ ifneq (Darwin,$(UNAME))
|
|
XLNKVERBOSE := --verbose
|
|
linkopt = $(if $1,$(XLNKOPT)$(if $2,$1=$(call quote,$2),$1))
|
|
abslibrpath = $(strip $(if $(findstring .$(ILIBEXT),$1)$(wildcard $1/), \
|
|
- $(call linkopt,--rpath,$(call qxdir,$(call qapath,$1)))))
|
|
+ $(call linkopt,--rpath,$(PREFIX)/lib)))
|
|
XGROUP_BEGIN := $(call linkopt,--start-group)
|
|
XGROUP_END := $(call linkopt,--end-group)
|
|
ifneq (0,$(ASNEEDED))
|