Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-08-11 09:30:14 -04:00
Code Issues Projects Releases Packages Wiki Activity

guix: cleanup manifest

Browse source
This commit is contained in:
tobtoht 2025-06-16 10:17:41 +02:00
parent c572e1ad00
commit 980f11f3ac
No known key found for this signature in database
GPG key ID: E45B10DD027D2472
2 changed files with 11 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

3
contrib/guix/libexec/build.sh
View file

@ -183,8 +183,7 @@ esac
[ -e /usr/bin ] || mkdir -p /usr/bin [ -e /usr/bin ] || mkdir -p /usr/bin
[ -e /lib64 ] || mkdir /lib64 [ -e /lib64 ] || mkdir /lib64
# Symlink file and env to a conventional path # Symlink env and shells to a conventional path
[ -e /usr/bin/file ] || ln -s --no-dereference "$(command -v file)" /usr/bin/file
[ -e /usr/bin/env ] || ln -s --no-dereference "$(command -v env)" /usr/bin/env [ -e /usr/bin/env ] || ln -s --no-dereference "$(command -v env)" /usr/bin/env
[ -e /bin/bash ] || ln -s --no-dereference "$(command -v bash)" /bin/bash [ -e /bin/bash ] || ln -s --no-dereference "$(command -v bash)" /bin/bash
[ -e /bin/sh ] || ln -s --no-dereference "$(command -v sh)" /bin/sh [ -e /bin/sh ] || ln -s --no-dereference "$(command -v sh)" /bin/sh

28
contrib/guix/manifest.scm
View file

@ -1,24 +1,18 @@
(use-modules (gnu packages) (use-modules (gnu packages)
(gnu packages autotools) ((gnu packages autotools) #:select (libtool))
(gnu packages bash) (gnu packages bash)
((gnu packages cmake) #:select (cmake-minimal)) ((gnu packages cmake) #:select (cmake-minimal))
(gnu packages commencement) (gnu packages commencement)
(gnu packages compression) (gnu packages compression)
(gnu packages cross-base) (gnu packages cross-base)
((gnu packages elf) #:select (patchelf))
(gnu packages file)
(gnu packages gawk) (gnu packages gawk)
(gnu packages gcc) (gnu packages gcc)
(gnu packages gperf) ((gnu packages linux) #:select (linux-libre-headers-6.1))
((gnu packages libusb) #:select (libplist))
((gnu packages linux) #:select (linux-libre-headers-6.1 util-linux))
(gnu packages llvm) (gnu packages llvm)
(gnu packages mingw) (gnu packages mingw)
(gnu packages moreutils)
(gnu packages perl) (gnu packages perl)
(gnu packages pkg-config) (gnu packages pkg-config)
((gnu packages python) #:select (python-minimal)) ((gnu packages python) #:select (python-minimal))
((gnu packages tls) #:select (openssl))
((gnu packages version-control) #:select (git-minimal)) ((gnu packages version-control) #:select (git-minimal))
(guix build-system gnu) (guix build-system gnu)
(guix build-system trivial) (guix build-system trivial)
@ -249,7 +243,6 @@ chain for " target " development."))
which which
;; File(system) inspection ;; File(system) inspection
file
grep grep
diffutils ; provides diff diffutils ; provides diff
findutils ; provides find and xargs findutils ; provides find and xargs
@ -258,25 +251,19 @@ chain for " target " development."))
patch patch
gawk gawk
sed sed
patchelf ; unused, occassionally useful for debugging
;; Compression and archiving ;; Compression and archiving
tar tar
bzip2 ; used to create release archives (non-windows) bzip2 ; used to unpack depends packages, create release archives (non-windows)
gzip ; used to unpack most packages in depends gzip ; used to unpack depends packages
xz ; used to unpack freebsd_base
zip ; used to create release archives (windows)
unzip ; used to unpack android_ndk
;; Build tools ;; Build tools
gnu-make gnu-make
libtool
pkg-config pkg-config
cmake-minimal cmake-minimal
;; Scripting ;; Scripting
perl ; required to build openssl in depends perl ; required to build openssl in depends
python-minimal ; required to build monero (cmake/CheckTrezor.cmake) and in android_ndk
;; Git ;; Git
git-minimal ; used to create the release source archive git-minimal ; used to create the release source archive
@ -284,6 +271,7 @@ chain for " target " development."))
(let ((target (getenv "HOST"))) (let ((target (getenv "HOST")))
(cond ((string-suffix? "-mingw32" target) (cond ((string-suffix? "-mingw32" target)
(list (list
zip ; used to create release archives
gcc-toolchain-12 gcc-toolchain-12
(make-mingw-pthreads-cross-toolchain target))) (make-mingw-pthreads-cross-toolchain target)))
((string-contains target "-linux-gnu") ((string-contains target "-linux-gnu")
@ -293,15 +281,19 @@ chain for " target " development."))
(make-monero-cross-toolchain target))) (make-monero-cross-toolchain target)))
((string-contains target "freebsd") ((string-contains target "freebsd")
(list (list
xz ; used to unpack freebsd_base
gcc-toolchain-12 gcc-toolchain-12
(list gcc-toolchain-12 "static") (list gcc-toolchain-12 "static")
clang-toolchain-11 binutils)) clang-toolchain-11 binutils))
((string-contains target "android") ((string-contains target "android")
(list (list
unzip ; used to unpack android_ndk
gcc-toolchain-12 gcc-toolchain-12
(list gcc-toolchain-12 "static"))) (list gcc-toolchain-12 "static")))
((string-contains target "darwin") ((string-contains target "darwin")
(list (list
libtool
python-minimal ; required to build libtapi in depends
gcc-toolchain-10 gcc-toolchain-10
clang-toolchain-11 clang-toolchain-11
binutils)) binutils))