diff options
| -rw-r--r-- | nongnu/packages/anydesk.scm | 4 | ||||
| -rw-r--r-- | nongnu/packages/chromium.scm | 4 | ||||
| -rw-r--r-- | nongnu/packages/dyalog.scm | 4 | ||||
| -rw-r--r-- | nongnu/packages/fonts.scm | 3 | ||||
| -rw-r--r-- | nongnu/packages/game-client.scm | 3 | ||||
| -rw-r--r-- | nongnu/packages/messaging.scm | 8 | ||||
| -rw-r--r-- | nongnu/packages/video.scm | 4 | ||||
| -rw-r--r-- | nonguix/build-system/chromium-binary.scm | 2 |
8 files changed, 6 insertions, 26 deletions
diff --git a/nongnu/packages/anydesk.scm b/nongnu/packages/anydesk.scm index 78e16f1b..f7bd3bd0 100644 --- a/nongnu/packages/anydesk.scm +++ b/nongnu/packages/anydesk.scm @@ -34,7 +34,7 @@ `(#:validate-runpath? #f #:strip-binaries? #f ;; For some reason it breaks the program #:patchelf-plan - `(("usr/bin/anydesk" ("atk" + `(("usr/bin/anydesk" ("at-spi2-core" "cairo" "fontconfig" "freetype" @@ -97,7 +97,7 @@ (install-file desktop-file applications)) #t))))) (inputs - `(("atk" ,atk) + `(("at-spi2-core" ,at-spi2-core) ("cairo" ,cairo) ("fontconfig" ,fontconfig) ("freetype" ,freetype) diff --git a/nongnu/packages/chromium.scm b/nongnu/packages/chromium.scm index 44677145..408a1059 100644 --- a/nongnu/packages/chromium.scm +++ b/nongnu/packages/chromium.scm @@ -50,9 +50,7 @@ (arguments `(#:patchelf-plan `(("Release/libcef.so" ("alsa-lib" - "at-spi2-atk" "at-spi2-core" - "atk" "cairo" "cups" "dbus" @@ -91,9 +89,7 @@ (inputs (list alsa-lib - at-spi2-atk at-spi2-core - atk cairo cups dbus diff --git a/nongnu/packages/dyalog.scm b/nongnu/packages/dyalog.scm index 770eb052..764c405d 100644 --- a/nongnu/packages/dyalog.scm +++ b/nongnu/packages/dyalog.scm @@ -49,9 +49,7 @@ (build-system gnu-build-system) (outputs '("out" "fonts")) (inputs (list alsa-lib - at-spi2-atk at-spi2-core - atk cairo coreutils cups @@ -175,9 +173,7 @@ (string-append (assoc-ref inputs pkg) "/lib")) '("alsa-lib" - "at-spi2-atk" "at-spi2-core" - "atk" "cairo" "cups" "dbus" diff --git a/nongnu/packages/fonts.scm b/nongnu/packages/fonts.scm index bdc02cdc..aeaadf97 100644 --- a/nongnu/packages/fonts.scm +++ b/nongnu/packages/fonts.scm @@ -203,8 +203,9 @@ Included fonts: (let ((7z-exe (search-input-file inputs "/bin/7z"))) (invoke 7z-exe "x" source) (invoke 7z-exe "x" (car (find-files "." "\\.pkg$"))) + (invoke 7z-exe "x" (car (find-files "." "^Payload$"))) (invoke 7z-exe "x" "Payload~"))))))) - (native-inputs (list p7zip)) + (native-inputs (list 7zip)) (home-page "https://developer.apple.com/fonts") (synopsis (string-append font-name " typeface by Apple.")) (description description) diff --git a/nongnu/packages/game-client.scm b/nongnu/packages/game-client.scm index 22a9c1c6..45c48118 100644 --- a/nongnu/packages/game-client.scm +++ b/nongnu/packages/game-client.scm @@ -220,7 +220,8 @@ implementation with gogdl and Amazon Games using Nile.") ("mangohud" ,mangohud) ("openal" ,openal) ; Prevents corrupt audio in Crypt of the Necrodancer. ("pulseaudio" ,pulseaudio) ; Prevents corrupt audio in Sven Coop. - ("python" ,python) ; Required for KillingFloor2 and Wreckfest. + ;; XXX: Change this back to 'python' when it is ungrafted in Guix. + ("python" ,python-3.11/fixed) ; Required for KillingFloor2 and Wreckfest. ("spdlog" ,spdlog))) ; Required for MangoHud. (define steam-container-libs diff --git a/nongnu/packages/messaging.scm b/nongnu/packages/messaging.scm index cada9a55..7e3b6458 100644 --- a/nongnu/packages/messaging.scm +++ b/nongnu/packages/messaging.scm @@ -151,9 +151,7 @@ or iOS.") ;; Note: it seems like some (all?) of these only do anything in ;; LD_LIBRARY_PATH, or at least needed there as well. #~(let ((libs '("alsa-lib" - "at-spi2-atk" "at-spi2-core" - "atk" "cairo" "cups" "dbus" @@ -236,8 +234,6 @@ or iOS.") ;; aomhost has a shorter needed list, ;; but untested. '("alsa-lib" - "atk" - "at-spi2-atk" "at-spi2-core" "cairo" "cups" @@ -277,8 +273,6 @@ or iOS.") #$@(map (lambda (pkg) (file-append (this-package-input pkg) "/lib")) '("alsa-lib" - "atk" - "at-spi2-atk" "at-spi2-core" "cairo" "cups" @@ -352,9 +346,7 @@ or iOS.") (#f "Zoom Video Conference"))))))))) (native-inputs (list tar)) (inputs (list alsa-lib - at-spi2-atk at-spi2-core - atk bash-minimal cairo cups diff --git a/nongnu/packages/video.scm b/nongnu/packages/video.scm index 7705bd16..b3a5573c 100644 --- a/nongnu/packages/video.scm +++ b/nongnu/packages/video.scm @@ -329,9 +329,7 @@ Browser source.")))) (list #:strip-binaries? #f ; prevent corruption of .NET programs #:patchelf-plan #~(let ((libs '("alsa-lib" - "at-spi2-atk" "at-spi2-core" - "atk" "cairo" "cups" "dbus" @@ -438,9 +436,7 @@ Browser source.")))) #:comment "Universal media aggregator")))))) (native-inputs (list unzip)) (inputs (list alsa-lib - at-spi2-atk at-spi2-core - atk bash-minimal cairo cups diff --git a/nonguix/build-system/chromium-binary.scm b/nonguix/build-system/chromium-binary.scm index 312c84c0..1809baa9 100644 --- a/nonguix/build-system/chromium-binary.scm +++ b/nonguix/build-system/chromium-binary.scm @@ -84,8 +84,6 @@ ;; Inputs needed by the Electron. (add-input-labels alsa-lib - atk - at-spi2-atk at-spi2-core bash-minimal cairo |