diff options
author | jade <lix@jade.fyi> | 2024-05-23 23:19:28 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@lix-systems> | 2024-05-23 23:19:28 +0000 |
commit | 9530b7f2b2b653fc11753ce452636896350324ff (patch) | |
tree | 837593bceacff5f2760594c5a115242ec63ddca9 /src/libutil | |
parent | 677cf75473d0dd86119c4535d8733a6a0b1100c0 (diff) | |
parent | c97e17144e0d0b666d7b79d8b4b0d581bfdf373b (diff) |
Merge "packaging: rename nixexpr -> lixexpr and so on" into main
Diffstat (limited to 'src/libutil')
-rw-r--r-- | src/libutil/lix-util.pc.in | 10 | ||||
-rw-r--r-- | src/libutil/meson.build | 18 |
2 files changed, 26 insertions, 2 deletions
diff --git a/src/libutil/lix-util.pc.in b/src/libutil/lix-util.pc.in new file mode 100644 index 000000000..cd749aabb --- /dev/null +++ b/src/libutil/lix-util.pc.in @@ -0,0 +1,10 @@ +prefix=@prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: Lix libutil +Description: Lix Package Manager (libutil) +Version: @PACKAGE_VERSION@ +Requires: lix-base lix-util +Libs: -L${libdir} -llixutil +Cflags: -I${includedir}/lix/libutil diff --git a/src/libutil/meson.build b/src/libutil/meson.build index 13266f6bd..58e0bd062 100644 --- a/src/libutil/meson.build +++ b/src/libutil/meson.build @@ -100,7 +100,7 @@ libutil_headers = files( ) libutil = library( - 'nixutil', + 'lixutil', libutil_sources, dependencies : [ aws_sdk, @@ -118,7 +118,21 @@ libutil = library( install : true, ) -install_headers(libutil_headers, subdir : 'nix', preserve_path : true) +install_headers(libutil_headers, subdir : 'lix/libutil', preserve_path : true) + +# FIXME: not using the pkg-config module because it creates way too many deps +# while meson migration is in progress, and we want to not include boost here +configure_file( + input : 'lix-util.pc.in', + output : 'lix-util.pc', + install_dir : libdir / 'pkgconfig', + configuration : { + 'prefix' : prefix, + 'libdir' : libdir, + 'includedir' : includedir, + 'PACKAGE_VERSION' : meson.project_version(), + }, +) # Used by libstore and libfetchers. liblixutil = declare_dependency( |