diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2022-04-28 16:24:46 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2022-04-28 16:24:46 +0200 |
| commit | 284fa7264963acc5d114ef5d54c347126b1654ba (patch) | |
| tree | 3e5360fcc81b6d0dce76a65aca60cf8528f2931f /gnu/packages/security-token.scm | |
| parent | 12c9da35389dfba86ae0d863132a6b2c4374205a (diff) | |
| parent | 882cacc1bb5be0df334dd7ce55b385a3a1678728 (diff) | |
| download | guix-284fa7264963acc5d114ef5d54c347126b1654ba.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/security-token.scm')
| -rw-r--r-- | gnu/packages/security-token.scm | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 129b8f6122..2cc1fa38c0 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -38,6 +38,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix gexp) + #:use-module (guix utils) #:use-module (guix git-download) #:use-module (guix build-system cargo) #:use-module (guix build-system cmake) @@ -903,14 +904,16 @@ phone is required.") (file-name (git-file-name name version)) (sha256 (base32 "12zy4cnlcffcb64lsx8198y09j1dwi0bcn9rr82q6i1k950yzd3p")))) (native-inputs (list pkg-config)) - (inputs - `(("zlib" ,zlib) - ("udev" ,eudev) - ("libcbor" ,libcbor) - ("openssl" ,openssl))) + (inputs (list eudev libcbor openssl zlib)) (build-system cmake-build-system) (arguments - '(#:phases + `(#:configure-flags + (list (string-append + "-DPKG_CONFIG_EXECUTABLE=" + (search-input-file %build-inputs + (string-append + "/bin/" ,(pkg-config-for-target))))) + #:phases (modify-phases %standard-phases ;; regress tests enabled only for debug builds (delete 'check)))) |