From db5e1399b90d5a339330bdd49c5bca6fe58d6f60 Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Tue, 2 Jan 2024 23:13:20 +0200 Subject: [PATCH] Fix pkg-config and Nix --- CMakeLists.txt | 1 + hyprlang.pc.in | 9 +++++---- nix/default.nix | 2 ++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b2ff23..4f17796 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.19) set(HYPRLANG_VERSION "0.2.0") set(PREFIX ${CMAKE_INSTALL_PREFIX}) +set(INCLUDE ${CMAKE_INSTALL_INCLUDEDIR}) project(hyprlang VERSION ${HYPRLANG_VERSION} diff --git a/hyprlang.pc.in b/hyprlang.pc.in index b1bfb5c..97350dc 100644 --- a/hyprlang.pc.in +++ b/hyprlang.pc.in @@ -1,9 +1,10 @@ -prefix="@PREFIX@" -includedir="${prefix}/include" +prefix=@PREFIX@ +includedir=@INCLUDE@ +libdir=${prefix}/lib Name: hyprlang URL: https://github.com/hyprwm/hyprlang Description: The official implementation library for the hypr config language. Version: @HYPRLANG_VERSION@ -Cflags: -I"${prefix}/include" -libs: -lhyprlang +Cflags: -I${includedir} +Libs: -L${libdir} -lhyprlang diff --git a/nix/default.nix b/nix/default.nix index 1dfa3fa..6c82078 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation { nativeBuildInputs = [cmake]; + outputs = ["out" "dev"]; + meta = with lib; { homepage = "https://github.com/hyprwm/hyprlang"; description = "The official implementation library for the hypr config language";