From 3cddb14174ba962aba65df19c03d4b53da3cbac1 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Wed, 2 Feb 2022 16:33:17 +0800 Subject: [PATCH] flake: break artiq false dependencies --- flake.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 48b074838..7d21236bf 100644 --- a/flake.nix +++ b/flake.nix @@ -101,8 +101,13 @@ rustc $src/artiq/test/libartiq_support/lib.rs -Cpanic=unwind -g ''; installPhase = '' - mkdir $out - cp libartiq_support.so $out + mkdir -p $out/lib $out/bin + cp libartiq_support.so $out/lib + cat > $out/bin/libartiq-support << EOF + #!/bin/sh + echo $out/lib/libartiq_support.so + EOF + chmod 755 $out/bin/libartiq-support ''; }; @@ -165,13 +170,13 @@ ]; # FIXME: automatically propagate lld_11 llvm_11 dependencies - checkInputs = [ pkgs.lld_11 pkgs.llvm_11 pkgs.lit outputcheck ]; + checkInputs = [ pkgs.lld_11 pkgs.llvm_11 libartiq-support pkgs.lit outputcheck ]; checkPhase = '' python -m unittest discover -v artiq.test TESTDIR=`mktemp -d` cp --no-preserve=mode,ownership -R $src/artiq/test/lit $TESTDIR - LIBARTIQ_SUPPORT=${libartiq-support}/libartiq_support.so lit -v $TESTDIR/lit + LIBARTIQ_SUPPORT=`libartiq-support` lit -v $TESTDIR/lit ''; };