Link with absolute store paths to libraries
This commit is contained in:
parent
53afe72493
commit
c882d0c0e8
|
@ -2,13 +2,13 @@
|
||||||
"nodes": {
|
"nodes": {
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"info": {
|
"info": {
|
||||||
"lastModified": 1588878864,
|
"lastModified": 1589812016,
|
||||||
"narHash": "sha256-0FFvF2iZosl1402T90plIYZ+QPbKUZTbuIvgWPh6l/Y="
|
"narHash": "sha256-uPUZj+g50IP6+KYPPU0Bffz+yxMhy8cPP7IV0MNNrG0="
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"owner": "ehmry",
|
"owner": "ehmry",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "93d0c88777bc229ab9628e883bd9b25baefda8eb",
|
"rev": "6c82b1adcb373f09815a70955022d272b875709c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -1,19 +1,14 @@
|
||||||
# SPDX-License-Identifier: CC0-1.0
|
# SPDX-License-Identifier: CC0-1.0
|
||||||
|
|
||||||
{ genodeSources, genodeBase, writeText }:
|
{ genodeSources, genodeBase }:
|
||||||
|
|
||||||
genodeSources.buildDepot {
|
genodeSources.buildDepot {
|
||||||
name = "posix";
|
name = "posix";
|
||||||
propagatedBuildInputs = [ genodeBase ];
|
propagatedBuildInputs = [ genodeBase ];
|
||||||
portInputs = [ genodeSources.ports.libc ];
|
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 = ''
|
postInstall = ''
|
||||||
|
ln -s ${genodeSources.depot "libc"}/lib/* ''${!outputLib}/lib/
|
||||||
|
|
||||||
local headerDir="''${!outputDev}/include"
|
local headerDir="''${!outputDev}/include"
|
||||||
mkdir -p "$headerDir"
|
mkdir -p "$headerDir"
|
||||||
pushd ${genodeSources.ports.libc}/*
|
pushd ${genodeSources.ports.libc}/*
|
||||||
|
|
Loading…
Reference in New Issue