ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-27 23:57:42 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #138286 from KLSMartin/md4c_fix_generated_pkg_config_file

Browse Source 
md4c: fix generated pkg-config .pc files
This commit is contained in:
Anderson Torres 2021-09-18 21:10:24 -03:00 committed by GitHub
commit 12e9664020
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 51 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/md4c/default.nix
View File

@ -16,6 +16,13 @@ stdenv.mkDerivation rec {
hash = "sha256-+LObAD5JB8Vb4Rt4hTo1Z4ispxzfFkkXA2sw6TKB7Yo=";
};
patches = [
# We set CMAKE_INSTALL_LIBDIR to the absolute path in $out, so
# prefix and exec_prefix cannot be $out, too
# Use CMake's _FULL_ variables instead of `prefix` concatenation.
./fix-pkgconfig.patch
];
nativeBuildInputs = [
cmake
pkg-config

44
pkgs/development/libraries/md4c/fix-pkgconfig.patch Normal file
View File

@ -0,0 +1,44 @@
From 0ab8f5a6ee305cf4edcebfdc7b9eb5f98302de75 Mon Sep 17 00:00:00 2001
From: Leif Middelschulte <Leif.Middelschulte@klsmartin.com>
Date: Fri, 17 Sep 2021 16:16:17 +0200
Subject: [PATCH] pc.in: use _FULL_ variable variants
Nix' cmake packaging handler replaces the CMAKE_INSTALL_INCLUDEDIR
with the absolute path. Which break package
portability (i.e. `prefix`-usage).
---
src/md4c-html.pc.in | 6 ++----
src/md4c.pc.in | 6 ++----
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/md4c-html.pc.in b/src/md4c-html.pc.in
index 504bb52..fec7df4 100644
--- a/src/md4c-html.pc.in
+++ b/src/md4c-html.pc.in
@@ -1,7 +1,5 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=@CMAKE_INSTALL_PREFIX@
-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
Name: @PROJECT_NAME@ HTML renderer
Description: Markdown to HTML converter library.
diff --git a/src/md4c.pc.in b/src/md4c.pc.in
index cd8842d..b5d81f8 100644
--- a/src/md4c.pc.in
+++ b/src/md4c.pc.in
@@ -1,7 +1,5 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=@CMAKE_INSTALL_PREFIX@
-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
Name: @PROJECT_NAME@
Description: Markdown parser library with a SAX-like callback-based interface.
--
2.31.0