diff --git a/flake.lock b/flake.lock index b208c54..863c134 100644 --- a/flake.lock +++ b/flake.lock @@ -2,13 +2,13 @@ "nodes": { "nixpkgs": { "info": { - "lastModified": 1588878864, - "narHash": "sha256-0FFvF2iZosl1402T90plIYZ+QPbKUZTbuIvgWPh6l/Y=" + "lastModified": 1589812016, + "narHash": "sha256-uPUZj+g50IP6+KYPPU0Bffz+yxMhy8cPP7IV0MNNrG0=" }, "locked": { "owner": "ehmry", "repo": "nixpkgs", - "rev": "93d0c88777bc229ab9628e883bd9b25baefda8eb", + "rev": "6c82b1adcb373f09815a70955022d272b875709c", "type": "github" }, "original": { diff --git a/overlay/libc/default.nix b/overlay/libc/default.nix index 423ff9c..cc6cc41 100644 --- a/overlay/libc/default.nix +++ b/overlay/libc/default.nix @@ -1,19 +1,14 @@ # SPDX-License-Identifier: CC0-1.0 -{ genodeSources, genodeBase, writeText }: +{ genodeSources, genodeBase }: genodeSources.buildDepot { name = "posix"; propagatedBuildInputs = [ genodeBase ]; portInputs = [ genodeSources.ports.libc ]; - preInstall = - # Take the libc ABI stubs rather than the actual libc. - # The libc needs a lot of work and we can't afford to - # rebuild the toolchain for every fix. - '' - find depot -name libc.abi.so -exec install -D {} "''${!outputLib}/libc.so" \; - ''; postInstall = '' + ln -s ${genodeSources.depot "libc"}/lib/* ''${!outputLib}/lib/ + local headerDir="''${!outputDev}/include" mkdir -p "$headerDir" pushd ${genodeSources.ports.libc}/*