Skip to content

Commit 285edfa

Browse files
fanquakeachow101
andcommitted
guix: use osslsigncode 2.5
Co-authored-by: Andrew Chow <[email protected]>
1 parent 1884b71 commit 285edfa

File tree

2 files changed

+9
-13
lines changed

2 files changed

+9
-13
lines changed

contrib/guix/libexec/codesign.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ mkdir -p "$DISTSRC"
7777
osslsigncode attach-signature \
7878
-in "$infile" \
7979
-out "${OUTDIR}/${infile_base/-unsigned}" \
80+
-CAfile "$GUIX_ENVIRONMENT/etc/ssl/certs/ca-certificates.crt" \
8081
-sigin codesignatures/win/"$infile_base".pem
8182
done
8283
;;

contrib/guix/manifest.scm

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
(gnu packages shells)
2929
(gnu packages tls)
3030
(gnu packages version-control)
31+
(guix build-system cmake)
3132
(guix build-system gnu)
3233
(guix build-system python)
3334
(guix build-system trivial)
@@ -238,27 +239,20 @@ parse, modify and abstract ELF, PE and MachO formats.")
238239
(define osslsigncode
239240
(package
240241
(name "osslsigncode")
241-
(version "2.0")
242+
(version "2.5")
242243
(source (origin
243244
(method url-fetch)
244245
(uri (string-append "https://github.com/mtrojnar/"
245246
name "/archive/" version ".tar.gz"))
246247
(sha256
247248
(base32
248-
"0byri6xny770wwb2nciq44j5071122l14bvv65axdd70nfjf0q2s"))))
249-
(build-system gnu-build-system)
250-
(native-inputs
251-
`(("pkg-config" ,pkg-config)
252-
("autoconf" ,autoconf)
253-
("automake" ,automake)
254-
("libtool" ,libtool)))
249+
"03by9706gg0an6dn48pljx38vcb76ziv11bgm8ilwsf293x2k4hv"))))
250+
(build-system cmake-build-system)
255251
(inputs
256-
`(("openssl" ,openssl)))
252+
`(("openssl", openssl)))
257253
(arguments
258-
`(#:configure-flags
259-
`("--without-gsf"
260-
"--without-curl"
261-
"--disable-dependency-tracking")))
254+
'(#:configure-flags
255+
(list "-DCMAKE_DISABLE_FIND_PACKAGE_CURL=TRUE")))
262256
(home-page "https://github.com/mtrojnar/osslsigncode")
263257
(synopsis "Authenticode signing and timestamping tool")
264258
(description "osslsigncode is a small tool that implements part of the
@@ -607,6 +601,7 @@ inspecting signatures in Mach-O binaries.")
607601
(list zip
608602
(make-mingw-pthreads-cross-toolchain "x86_64-w64-mingw32")
609603
(make-nsis-for-gcc-10 nsis-x86_64)
604+
nss-certs
610605
osslsigncode))
611606
((string-contains target "-linux-")
612607
(list (make-bitcoin-cross-toolchain target)))

0 commit comments

Comments
 (0)