| Message ID | da306a33548cc76d5a647bdba7e2cb423f37b1ff.1721940003.git.soeren@soeren-tempel.net |
|---|---|
| State | New |
| Headers | show |
| Series | [bug#72106,v3,1/5] gnu: klee: Wrap klee-stats for Python dependencies. | expand |
Am Donnerstag, dem 25.07.2024 um 22:39 +0200 schrieb soeren@soeren-tempel.net: > From: Sören Tempel <soeren@soeren-tempel.net> > > * gnu/packages/check.scm (klee): Wrap klee-stats. > --- > gnu/packages/check.scm | 12 ++++++++++-- > 1 file changed, 10 insertions(+), 2 deletions(-) > > diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm > index 412b94569c..3c5ed7a3c3 100644 > --- a/gnu/packages/check.scm > +++ b/gnu/packages/check.scm > @@ -1070,7 +1070,15 @@ (define-public klee > (substitute* "CMakeLists.txt" > > (("\\$\\{KLEE_UCLIBC_PATH\\}/lib/libc\\.a") > "${KLEE_UCLIBC_PATH}")))) > - (add-after 'install 'wrap-hooks > + (add-after 'install 'wrap-klee-stats > + (lambda* (#:key outputs #:allow-other-keys) > + (let* ((out (assoc-ref outputs "out")) > + (bin (string-append out "/bin"))) > + (wrap-program (string-append bin "/klee- > stats") > + `("GUIX_PYTHONPATH" ":" prefix > + ,(search-path-as-string->list > + (getenv "GUIX_PYTHONPATH"))))))) > + (add-after 'install 'wrap-klee > (lambda* (#:key inputs outputs #:allow- > other-keys) > (let* ((out (assoc-ref outputs "out")) > (bin (string-append out "/bin")) Why not consolidate these into a single 'wrap phase? Cheers
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 412b94569c..3c5ed7a3c3 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1070,7 +1070,15 @@ (define-public klee (substitute* "CMakeLists.txt" (("\\$\\{KLEE_UCLIBC_PATH\\}/lib/libc\\.a") "${KLEE_UCLIBC_PATH}")))) - (add-after 'install 'wrap-hooks + (add-after 'install 'wrap-klee-stats + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (wrap-program (string-append bin "/klee-stats") + `("GUIX_PYTHONPATH" ":" prefix + ,(search-path-as-string->list + (getenv "GUIX_PYTHONPATH"))))))) + (add-after 'install 'wrap-klee (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin")) @@ -1088,7 +1096,7 @@ (define-public klee (search-input-file %build-inputs "/lib/klee/libc.a")) "-DENABLE_POSIX_RUNTIME=ON"))) (native-inputs (list clang-13 llvm-13 python-lit)) - (inputs (list bash-minimal klee-uclibc gperftools sqlite z3)) + (inputs (list bash-minimal klee-uclibc gperftools sqlite z3 python python-tabulate)) (build-system cmake-build-system) (home-page "https://klee-se.org/") (synopsis "Symbolic execution engine")
From: Sören Tempel <soeren@soeren-tempel.net> * gnu/packages/check.scm (klee): Wrap klee-stats. --- gnu/packages/check.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) base-commit: 03062c7a9fd74d625639e1a325e9cb58d1cd74e3