diff options
| author | Jade Lovelace <lix@jade.fyi> | 2024-05-16 17:04:05 -0700 |
|---|---|---|
| committer | Qyriad <qyriad@qyriad.me> | 2024-05-23 16:45:23 -0600 |
| commit | c97e17144e0d0b666d7b79d8b4b0d581bfdf373b (patch) | |
| tree | 1d1193055f45f9dcc63ae3908af8fdc01c7434df /package.nix | |
| parent | 774c56094f3f3dcb1f25fe147c52604ad664bd5b (diff) | |
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 `<nix/>` from
includes, so: `#include <nix/expr.hh>` -> `#include <expr.hh>`. 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
Diffstat (limited to 'package.nix')
| -rw-r--r-- | package.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package.nix b/package.nix index be3bcfb35..ebafa9420 100644 --- a/package.nix +++ b/package.nix @@ -49,7 +49,7 @@ # internal fork of nix-doc providing :doc in the repl lix-doc ? __forDefaults.lix-doc, - pname ? "nix", + pname ? "lix", versionSuffix ? "", officialRelease ? false, # Set to true to build the release notes for the next release. @@ -333,7 +333,7 @@ stdenv.mkDerivation (finalAttrs: { echo "file binary-dist $out/bin/nix" >> $out/nix-support/hydra-build-products '' + lib.optionalString stdenv.isDarwin '' - for lib in libnixutil.dylib libnixexpr.dylib; do + for lib in liblixutil.dylib liblixexpr.dylib; do install_name_tool \ -change "${lib.getLib boost}/lib/libboost_context.dylib" \ "$out/lib/libboost_context.dylib" \ |