public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lkl: split outputs

Browse Source 
Breaking out lib allows users to link against lkl without pulling the
kitchen sink into their closure.
This commit is contained in:
Joachim Fasting 2017-05-24 00:43:22 +02:00
parent e0b623a56d
commit 49ecd62c08
No known key found for this signature in database
GPG Key ID: 7544761007FE4E08
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/virtualization/lkl/default.nix
View File

@ -4,6 +4,8 @@ stdenv.mkDerivation rec {
name = "lkl-2017-03-24"; name = "lkl-2017-03-24";
rev = "a063e1631db5e2b9b04f184c5e6d185c1cd645cb"; rev = "a063e1631db5e2b9b04f184c5e6d185c1cd645cb";
outputs = [ "dev" "lib" "out" ];
nativeBuildInputs = [ bc python ]; nativeBuildInputs = [ bc python ];
buildInputs = [ fuse libarchive ]; buildInputs = [ fuse libarchive ];
@ -19,15 +21,15 @@ stdenv.mkDerivation rec {
prePatch = "patchShebangs arch/lkl/scripts"; prePatch = "patchShebangs arch/lkl/scripts";
installPhase = '' installPhase = ''
mkdir -p $out/{bin,lib} mkdir -p $out/bin $lib/lib $dev
# This tool assumes a different directory structure so let's point it at the right location
cp tools/lkl/bin/lkl-hijack.sh $out/bin cp tools/lkl/bin/lkl-hijack.sh $out/bin
substituteInPlace $out/bin/lkl-hijack.sh --replace '/../' '/../lib' sed -i $out/bin/lkl-hijack.sh \
-e "s,LD_LIBRARY_PATH=.*,LD_LIBRARY_PATH=$lib/lib,"
cp tools/lkl/{cptofs,cpfromfs,fs2tar,lklfuse} $out/bin cp tools/lkl/{cptofs,cpfromfs,fs2tar,lklfuse} $out/bin
cp -r tools/lkl/include $out cp -r tools/lkl/include $dev/
cp tools/lkl/liblkl*.{a,so} $out/lib cp tools/lkl/liblkl*.{a,so} $lib/lib
''; '';
# We turn off format and fortify because of these errors (fortify implies -O2, which breaks the jitter entropy code): # We turn off format and fortify because of these errors (fortify implies -O2, which breaks the jitter entropy code):