diff options
| author | Reno Dakota <170618376+paparodeo@users.noreply.github.com> | 2024-05-29 10:05:35 +0000 |
|---|---|---|
| committer | Reno Dakota <170618376+paparodeo@users.noreply.github.com> | 2024-05-29 10:05:35 +0000 |
| commit | fd29e43fcbc5ab51c8c27ac84260228911d8f508 (patch) | |
| tree | aa51d222e866a5e9e0e6826b9bda445ea3832171 /pkgs/tools/filesystems | |
| parent | f478e1cb40ff17ef02ab22f45e0512868b0c86c6 (diff) | |
boxfs: add missing includes to fix clang build
Diffstat (limited to 'pkgs/tools/filesystems')
| -rw-r--r-- | pkgs/tools/filesystems/boxfs/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/boxfs/libapp-include-ctype.diff | 11 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/boxfs/work-around-API-borkage.patch | 12 |
3 files changed, 25 insertions, 3 deletions
diff --git a/pkgs/tools/filesystems/boxfs/default.nix b/pkgs/tools/filesystems/boxfs/default.nix index ef611afd5d090..04106ee68b314 100644 --- a/pkgs/tools/filesystems/boxfs/default.nix +++ b/pkgs/tools/filesystems/boxfs/default.nix @@ -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 ]; diff --git a/pkgs/tools/filesystems/boxfs/libapp-include-ctype.diff b/pkgs/tools/filesystems/boxfs/libapp-include-ctype.diff new file mode 100644 index 0000000000000..ab0492165e86a --- /dev/null +++ b/pkgs/tools/filesystems/boxfs/libapp-include-ctype.diff @@ -0,0 +1,11 @@ +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> diff --git a/pkgs/tools/filesystems/boxfs/work-around-API-borkage.patch b/pkgs/tools/filesystems/boxfs/work-around-API-borkage.patch index b74e7f3246651..a473111e7aa5f 100644 --- a/pkgs/tools/filesystems/boxfs/work-around-API-borkage.patch +++ b/pkgs/tools/filesystems/boxfs/work-around-API-borkage.patch @@ -1,8 +1,16 @@ 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" |