From c97e17144e0d0b666d7b79d8b4b0d581bfdf373b Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Thu, 16 May 2024 17:04:05 -0700 Subject: packaging: rename nixexpr -> lixexpr and so on This breaks downstreams linking to us on purpose to make sure that if someone is linking to Lix they're doing it on purpose and crucially not mixing up Nix and Lix versions in compatibility code. We still need to fix the internal includes to follow the same schema so we can drop the single-level include system entirely. However, this requires a little more effort. This adds pkg-config for libfetchers and config.h. Migration path: expr.hh -> lix/libexpr/expr.hh nix/config.h -> lix/config.h To apply this migration automatically, remove all `` from includes, so: `#include ` -> `#include `. Then, the correct paths will be resolved from the tangled mess, and the clang-tidy automated fix will work. Then run the following for out of tree projects: ``` lix_root=$HOME/lix (cd $lix_root/clang-tidy && nix develop -c 'meson setup build && ninja -C build') run-clang-tidy -checks='-*,lix-fixincludes' -load=$lix_root/clang-tidy/build/liblix-clang-tidy.so -p build/ -fix src ``` Related: https://git.lix.systems/lix-project/nix-eval-jobs/pulls/5 Fixes: https://git.lix.systems/lix-project/lix/issues/279 Change-Id: I7498e903afa6850a731ef8ce77a70da6b2b46966 --- perl/lib/Nix/meson.build | 2 +- perl/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'perl') diff --git a/perl/lib/Nix/meson.build b/perl/lib/Nix/meson.build index 6810622e3..1d235b74c 100644 --- a/perl/lib/Nix/meson.build +++ b/perl/lib/Nix/meson.build @@ -27,7 +27,7 @@ perl_libstore = shared_module( ], link_args : [ # Nix doesn't provide a pkg-config file for libutil. - '-lnixutil', + '-llixutil', soname_args, ], install : true, diff --git a/perl/meson.build b/perl/meson.build index 75c7c2c79..4b179da8f 100644 --- a/perl/meson.build +++ b/perl/meson.build @@ -64,6 +64,6 @@ if cxx.get_linker_id() in ['ld.bfd', 'ld.gold'] add_project_link_arguments('-Wl,--no-copy-dt-needed-entries', language : 'cpp') endif -libstore = dependency('nixstore', 'nix-store', required : true) +libstore = dependency('lixstore', 'lix-store', required : true) subdir('lib/Nix') -- cgit v1.2.3