Skip to content

Commit 3bc8040

Browse files
committed
export include and lib paths for deps
1 parent 95fc4c7 commit 3bc8040

4 files changed

Lines changed: 26 additions & 4 deletions

File tree

deps/botan2/default.nix

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,10 @@ in
2323
runHook postBuild
2424
'';
2525
})
26+
27+
passthru = (oldAttrs.passthru or {}) // {
28+
include_root = "${dev}/include";
29+
include = "${dev}/include/botan-2"; # include/botan2/botan/*.h
30+
lib = "${lib}/lib";
31+
};
32+
})

deps/http-parser/default.nix

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ let
77
# TODO: Upstream doesn't use that subdir though, so better fix IncludeOS
88
# sources.
99
#
10-
# Uses a more recent version of nixpkgs to get support for static builds
10+
# Uses a more recent version of nixpkgs to get support for static builds # TODO: verify if still obsolete
1111
nixpkgsHttpfix = builtins.fetchTarball {
1212
url = "https://github.com/NixOS/nixpkgs/archive/33f464b661f939689aa56af6b6e27b504c5afb93.tar.gz";
1313
sha256 = "15bdlccjg14qa7lwkcc7pikvi386ig108ca62hbxfas5wyw1fr62";
@@ -26,4 +26,9 @@ in
2626
mkdir "$out/include/http-parser"
2727
ln -sr "$out/include/http_parser.h" "$out/include/http-parser"
2828
'';
29+
passthru = (oldAttrs.passthru or {}) // {
30+
include_root = "${dev}/include";
31+
include = "${dev}/include"; # TODO: consider subdir?
32+
lib = "${self}/lib";
33+
};
2934
})

deps/lest/default.nix

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ let
3030
dev = pkgs.lib.getDev self;
3131
lib = pkgs.lib.getLib self;
3232
in
33-
self.overrideAttrs (oldAttrs: {
33+
self.overrideAttrs (prev: {
34+
passthru = (prev.passthru or {}) // {
35+
include_root = "${dev}/include";
36+
include = "${dev}/include/lest";
37+
# lib = "${self}"; # TODO: consider precompiling
38+
};
3439
})
35-

deps/uzlib/default.nix

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ let
66
self = stdenv.mkDerivation rec {
77
pname = "uzlib";
88

9+
# TODO: update?
910
# Latest version, seems incompatible with IncludeOS.
1011
#version = "2.9.5";
1112
#
@@ -63,5 +64,10 @@ let
6364
dev = pkgs.lib.getDev self;
6465
lib = pkgs.lib.getLib self;
6566
in
66-
self.overrideAttrs (oldAttrs: {
67+
self.overrideAttrs (prev: {
68+
passthru = (prev.passthru or {}) // {
69+
include_root = "${dev}/include";
70+
include = "${dev}/include"; # TODO: consider subdir?
71+
lib = "${self}/lib";
72+
};
6773
})

0 commit comments

Comments
 (0)