Unverified Commit 3981dd2b authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #315731 from NixOS/backport-315583-to-release-24.05 

[Backport release-24.05] boxfs: add missing includes to fix clang build
parents 7fd53be8 e603dbe9

pkgs/tools/filesystems/boxfs/default.nix

+4 −1
Original line number Diff line number Diff line
@@ -32,7 +32,10 @@ in stdenv.mkDerivation { 
    cp -a --no-preserve=mode ${libapp} libapp

    cp -a --no-preserve=mode ${libjson} libjson

  '';

  patches = [ ./work-around-API-borkage.patch ];

  patches = [

    ./work-around-API-borkage.patch

    ./libapp-include-ctype.diff

  ];



  buildInputs = [ curl fuse libxml2 ];

  nativeBuildInputs = [ pkg-config ];

pkgs/tools/filesystems/boxfs/libapp-include-ctype.diff

0 → 100644
+11 −0
Original line number Diff line number Diff line 
diff --git a/libapp/libapp/app.c b/libapp/libapp/app.c

index 0188795..f9f1cfa 100644

--- a/libapp/libapp/app.c

+++ b/libapp/libapp/app.c

@@ -1,5 +1,6 @@

 #include "app.h"

 

+#include <ctype.h>

 #include <stdlib.h>

 #include <string.h>

 #include <libgen.h>

pkgs/tools/filesystems/boxfs/work-around-API-borkage.patch

+10 −2
Original line number Diff line number Diff line 
diff --git a/boxapi.c b/boxapi.c

index 4964273..1a32e0d 100644

index 4964273..e4b7404 100644

--- a/boxapi.c

+++ b/boxapi.c

@@ -38,8 +38,8 @@

@@ -29,6 +29,7 @@

 #include <curl/curl.h>

 

 #include <libxml/hash.h>

+#include <libxml/parser.h>

 

 #include <libapp/app.h>

 /* Building blocks for OpenBox api endpoints

@@ -38,8 +39,8 @@

 //    AUTH

 #define API_KEY_VAL "f9ss11y2w0hg5r04jsidxlhk4pil28cf"

 #define API_SECRET  "r3ZHAIhsOL2FoHjgERI9xf74W5skIM0w"