guix-packages/ambrevar/streetsofrage: Use libcrypto input
parent
cdfb9c8141
commit
b6f6f0fa76
|
@ -6,12 +6,13 @@
|
|||
#:use-module (guix download)
|
||||
#:use-module (gnu packages base)
|
||||
#:use-module (gnu packages bash)
|
||||
#:use-module (gnu packages gcc)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages elf)
|
||||
#:use-module (gnu packages gcc)
|
||||
#:use-module (gnu packages image)
|
||||
#:use-module (gnu packages linux)
|
||||
#:use-module (gnu packages sdl))
|
||||
#:use-module (gnu packages sdl)
|
||||
#:use-module (gnu packages tls))
|
||||
|
||||
(define (to32 package64)
|
||||
"Build package for i686-linux.
|
||||
|
@ -159,7 +160,7 @@ guix environment --container \
|
|||
("alsa-lib" ,(to32 alsa-lib))
|
||||
("sdl" ,(to32 sdl))
|
||||
("sdl-mixer" ,(to32 sdl-mixer))
|
||||
;; TODO: Use openssl@1.0.2p to replace libcrypto.
|
||||
("libcrypto" ,(to32 openssl))
|
||||
("libpng" ,(to32 libpng-1.2))))
|
||||
(native-inputs
|
||||
`(("patchelf" ,(to32 patchelf))
|
||||
|
@ -199,7 +200,7 @@ guix environment --container \
|
|||
;; Sort out libraries from bennugd:
|
||||
(for-each (lambda (f) (rename-file (string-append "bennugd/" f)
|
||||
(string-append "lib/" f)))
|
||||
'("libbgdrtm.so" "libcrypto.so.1.0.0" "libdraw.so"))
|
||||
'("libbgdrtm.so" "libdraw.so"))
|
||||
(delete-file-recursively "bennugd")
|
||||
(with-directory-excursion "lib"
|
||||
(for-each (lambda (f) (rename-file f
|
||||
|
@ -210,6 +211,7 @@ guix environment --container \
|
|||
(sdl (assoc-ref %build-inputs "sdl"))
|
||||
(sdl-mixer (assoc-ref %build-inputs "sdl-mixer"))
|
||||
(libpng (assoc-ref %build-inputs "libpng"))
|
||||
(libcrypto (assoc-ref %build-inputs "libcrypto"))
|
||||
(glibc (assoc-ref %build-inputs "glibc")))
|
||||
(invoke "patchelf" "--set-interpreter" (string-append glibc "/lib/ld-linux.so.2")
|
||||
(string-append out "/bin/bgdi"))
|
||||
|
@ -220,6 +222,7 @@ guix environment --container \
|
|||
(string-append sdl "/lib") ":"
|
||||
(string-append sdl-mixer "/lib") ":"
|
||||
(string-append libpng "/lib") ":"
|
||||
(string-append libcrypto "/lib") ":"
|
||||
(string-append zlib "/lib"))
|
||||
f))
|
||||
(append (list (string-append out "/bin/bgdi"))
|
||||
|
|
Loading…
Reference in New Issue