bartronx7/guix
1
0
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2026-01-25 03:55:08 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

build-system/cargo: Remove uneeded use of cargo-guile-json.

Browse source 
* gnu/packages/antivirus.scm (clamav)
* gnu/packages/freedesktop.scm (waypipe)
* gnu/packages/gnome.scm (librsvg)
* gnu/packages/kde-pim.scm (kdepim-addons)
* gnu/packages/language.scm (libchewing)
* gnu/packages/rust-apps.scm (helvum)
* gnu/packages/shells.scm (fish):
[arguments]<#:phases>: Remove uneeded use of cargo-guile-json
extension.

Change-Id: I041819515585777a3d63945b755d71e607fa0650
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
This commit is contained in:
Nicolas Graves 2026-01-17 00:22:33 +01:00 • committed by Sharlatan Hellseher
parent 3f1012e46e
commit 988995fb5d
No known key found for this signature in database
GPG key ID: 76D727BFF62CD2B5
7 changed files with 16 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gnu/packages/antivirus.scm
View file

@ -83,7 +83,6 @@
(guix build cmake-build-system)
(guix build utils))
#:phases
(with-extensions (list (cargo-guile-json))
#~(modify-phases %standard-phases
(add-after 'unpack 'prepare-cargo-build-system
(lambda args
@ -112,7 +111,7 @@
(substitute* "unit_tests/CMakeLists.txt"
(("clamd_test\\.py" test)
(string-append
test " -k \"not test_clamd_08_VirusEvent\""))))))))))
test " -k \"not test_clamd_08_VirusEvent\"")))))))))
(native-inputs
(append
(list pkg-config

19
gnu/packages/freedesktop.scm
View file

@ -3530,25 +3530,24 @@ notifies the user using any notification daemon implementing
(guix build meson-build-system)
(guix build utils))
#:phases
(with-extensions (list (cargo-guile-json))
#~(modify-phases %standard-phases
#~(modify-phases %standard-phases
(add-after 'unpack 'prepare-cargo-build-system
(lambda args
(for-each
(lambda (phase)
(apply (assoc-ref cargo:%standard-phases phase)
#:cargo-target #$(cargo-triplet) args))
'(unpack-rust-crates
configure
check-for-pregenerated-files
patch-cargo-checksums))))
(lambda (phase)
(apply (assoc-ref cargo:%standard-phases phase)
#:cargo-target #$(cargo-triplet) args))
'(unpack-rust-crates
configure
check-for-pregenerated-files
patch-cargo-checksums))))
(add-after 'unpack 'patch-vulkan
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "src/dmabuf.rs"
(("Entry::load\\(\\)")
(string-append "Entry::load_from(\""
(search-input-file inputs "lib/libvulkan.so")
"\")")))))))
"\")"))))))
#:configure-flags
#~(list "-Dwith_lz4=enabled"
"-Dwith_vaapi=enabled"

6
gnu/packages/gnome.scm
View file

@ -3599,7 +3599,6 @@ for dealing with different structured file formats.")
(guix build gnu-build-system)
(guix build utils))
#:phases
(with-extensions (list (cargo-guile-json))
#~(modify-phases %standard-phases
(add-after 'unpack 'patch-gdk-pixbuf-thumbnailer
(lambda* (#:key inputs #:allow-other-keys)
@ -3651,7 +3650,7 @@ for dealing with different structured file formats.")
'(unpack-rust-crates
configure
check-for-pregenerated-files
patch-cargo-checksums))))))))
patch-cargo-checksums)))))))
(native-inputs
(append
(list gdk-pixbuf
@ -10492,7 +10491,6 @@ specified duration and save it as a GIF encoded animated image file.")
(guix build meson-build-system)
(guix build utils))
#:phases
(with-extensions (list (cargo-guile-json))
#~(modify-phases %standard-phases
(add-after 'unpack 'prepare-for-build
(lambda _
@ -10519,7 +10517,7 @@ specified duration and save it as a GIF encoded animated image file.")
'(unpack-rust-crates
configure
check-for-pregenerated-files
patch-cargo-checksums))))))))
patch-cargo-checksums)))))))
(native-inputs
(append
(list gettext-minimal

3
gnu/packages/kde-pim.scm
View file

@ -997,7 +997,6 @@ verifiedserverdialogtest" ;SEGFAULT
(guix build qt-build-system)
(guix build utils))
#:phases
(with-extensions (list (cargo-guile-json))
#~(modify-phases %standard-phases
(add-before 'configure 'change-directory-to-adblock
(lambda _
@ -1020,7 +1019,7 @@ verifiedserverdialogtest" ;SEGFAULT
(lambda* (#:key tests? (test-exclude "") #:allow-other-keys)
(setenv "HOME" "/tmp")
(when tests?
(invoke "dbus-launch" "ctest" "-E" test-exclude))))))))
(invoke "dbus-launch" "ctest" "-E" test-exclude)))))))
(native-inputs
(list corrosion
dbus

3
gnu/packages/language.scm
View file

@ -297,7 +297,6 @@ Random Cage Fighting Birds, Cool Music etc.")
,@%cargo-build-system-modules)
#:out-of-source? #f ;For the tests.
#:phases
(with-extensions (list (cargo-guile-json))
#~(modify-phases %standard-phases
(add-after 'unpack 'prepare-cargo-build-system
(lambda args
@ -317,7 +316,7 @@ Random Cage Fighting Birds, Cool Music etc.")
(lambda _
;; Remove this phase when we can find ncurses with cmake.
(substitute* "tests/CMakeLists.txt"
(("CURSES_FOUND") "FALSE"))))))))
(("CURSES_FOUND") "FALSE")))))))
(native-inputs
(append
(list rust `(,rust "cargo") )

3
gnu/packages/rust-apps.scm
View file

@ -1364,7 +1364,6 @@ repositories.")
(guix build meson-build-system)
(guix build utils))
#:phases
(with-extensions (list (cargo-guile-json))
#~(modify-phases %standard-phases
(add-after 'unpack 'prepare-for-build
(lambda _
@ -1387,7 +1386,7 @@ repositories.")
'(unpack-rust-crates
configure
check-for-pregenerated-files
patch-cargo-checksums))))))))
patch-cargo-checksums)))))))
(native-inputs (list clang pkg-config rust `(,rust "cargo")))
(inputs (cons* glib gtk libadwaita pipewire (cargo-inputs 'helvum)))
(home-page "https://gitlab.freedesktop.org/pipewire/helvum")

3
gnu/packages/shells.scm
View file

@ -171,7 +171,6 @@ direct descendant of NetBSD's Almquist Shell (@command{ash}).")
((guix build gnu-build-system) #:prefix gnu:)
(guix build utils))
#:phases
(with-extensions (list (cargo-guile-json))
#~(modify-phases %standard-phases
(add-after 'unpack 'use-guix-vendored-dependencies
(lambda _
@ -302,7 +301,7 @@ direct descendant of NetBSD's Almquist Shell (@command{ash}).")
" set -e fish_function_path\n"
"end\n")
port)
(close-port port))))))))
(close-port port)))))))
(synopsis "The friendly interactive shell")
(description
"Fish (friendly interactive shell) is a shell focused on interactive use,