Unverified Commit 8d73becb authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #233376 from panicgh/libxisf

libxisf: 0.2.3 -> 0.2.8
parents 5d486408 07c3776e
Loading
Loading
Loading
Loading
+23 −0
Original line number Diff line number Diff line
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Nicolas Benes <nbenes.gh@xandea.de>
Date: Mon, 22 May 2023 09:25:27 +0200
Subject: [PATCH] Fix pkg-config paths


diff --git a/libxisf.pc.in b/libxisf.pc.in
index b0b8b53..944b068 100644
--- a/libxisf.pc.in
+++ b/libxisf.pc.in
@@ -1,7 +1,7 @@
 prefix="@CMAKE_INSTALL_PREFIX@"
 exec_prefix="${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: @CMAKE_PROJECT_DESCRIPTION@
-- 
2.38.5
+6 −2
Original line number Diff line number Diff line
@@ -10,16 +10,20 @@

stdenv.mkDerivation (finalAttrs: {
  pname = "libxisf";
  version = "0.2.3";
  version = "0.2.8";

  src = fetchFromGitea {
    domain = "gitea.nouspiro.space";
    owner = "nou";
    repo = "libXISF";
    rev = "v${finalAttrs.version}";
    hash = "sha256-u5EYnRO2rUV8ofLL9qfACeVvVbWXEXpkqh2Q4OOxpaQ=";
    hash = "sha256-YB97vMz2+cFRYq8x2Su3Eh952U6kGIVLYV7kDEd5S8g=";
  };

  patches = [
    ./0001-Fix-pkg-config-paths.patch
  ];

  nativeBuildInputs = [
    cmake
    pkg-config