mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 07:23:20 +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.
29 lines
823 B
Diff
29 lines
823 B
Diff
diff --git a/Makefile.am b/Makefile.am
|
|
index 0e69cd4..b4a1f1a 100644
|
|
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -26,7 +26,7 @@ dist_pkgconfig_DATA=libuldaq.pc
|
|
# fpga/USB_DIO32HS.bin
|
|
|
|
if OS_LINUX
|
|
-rulesdatadir=/lib/udev/rules.d/
|
|
+rulesdatadir=$(libdir)/udev/rules.d/
|
|
dist_rulesdata_DATA=rules/50-uldaq.rules
|
|
endif
|
|
|
|
@@ -42,14 +42,6 @@ dist-up: dist
|
|
mkdir -p $(reldir)
|
|
cp $(distdir).tar.bz2 $(reldir)
|
|
|
|
-if OS_LINUX
|
|
-install-data-hook:
|
|
- udevadm control --reload-rules && \
|
|
- test -f "/etc/redhat-release" && echo "/usr/local/lib" > /etc/ld.so.conf.d/uldaq.conf || echo "" && \
|
|
- test -f "/etc/arch-release" && echo "/usr/local/lib" > /etc/ld.so.conf.d/uldaq.conf || echo "" && \
|
|
- ldconfig
|
|
-endif
|
|
-
|
|
if OS_LINUX
|
|
uninstall-hook:
|
|
test -f "/etc/ld.so.conf.d/uldaq.conf" && rm "/etc/ld.so.conf.d/uldaq.conf" || echo ""
|