@@ 1009,19 1009,19 @@ application suites.")
(package
(inherit gtk+-2)
(name "gtk+")
- (version "3.24.43")
- (replacement gtk+/fixed)
- (source
- (origin
- (method url-fetch)
- (uri (string-append "mirror://gnome/sources/" name "/"
- (version-major+minor version) "/"
- name "-" version ".tar.xz"))
- (sha256
- (base32
- "1izky8dxaxp4bg5nii4n58dgpkw79mvmvbkldf04n0qmhmjg013y"))
- (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch"
- "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch"))))
+ (version "3.24.49")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.gnome.org/GNOME/gtk")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0flsnh3f0l9v3y2hmnxz1h15nw1l12ixmiwcpiy1ywplrlgq4j00"))
+ (patches (search-patches
+ "gtk3-respect-GUIX_GTK3_PATH.patch"
+ "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch"))))
;; There is no "doc" output, because adding gtk-doc here would introduce a
;; dependency cycle with itself.
(outputs '("out" "bin"))
@@ 1097,11 1097,17 @@ application suites.")
#~(modify-phases %standard-phases
(add-after 'unpack 'disable-failing-tests
(lambda _
- ;; These tests fail only in the containerized environment, for
- ;; unknown reasons.
- (substitute* "testsuite/gtk/meson.build"
- ((".*\\['defaultvalue'],.*") "")
- ((".*\\['objects-finalize',.*") ""))))
+ ;; These tests fail only in the containerized environment, for
+ ;; unknown reasons.
+ (substitute* "testsuite/gtk/meson.build"
+ ((".*\\['defaultvalue'],.*") "")
+ ((".*\\['objects-finalize',.*") ""))
+ ;; The 'flipping-icons.ui' and 'gtk-icontheme-sizing.ui' tests
+ ;; fail for unknown reasons (see:
+ ;; <https://gitlab.gnome.org/GNOME/gtk/-/issues/7679>).
+ (substitute* "testsuite/reftests/meson.build"
+ ((" 'flipping-icons.ui',.*") "")
+ ((" 'gtk-icontheme-sizing.ui',.*") ""))))
(add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file
(assoc-ref glib-or-gtk:%standard-phases
'generate-gdk-pixbuf-loaders-cache-file))
@@ 1128,41 1134,6 @@ application suites.")
(variable "GUIX_GTK3_PATH")
(files '("lib/gtk-3.0")))))))
-(define-public gtk+/fixed
- (package
- (inherit gtk+)
- (name "gtk+")
- (version "3.24.49")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://gitlab.gnome.org/GNOME/gtk")
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0flsnh3f0l9v3y2hmnxz1h15nw1l12ixmiwcpiy1ywplrlgq4j00"))
- (patches (search-patches
- "gtk3-respect-GUIX_GTK3_PATH.patch"
- "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch"))))
- (arguments
- (substitute-keyword-arguments (package-arguments gtk+)
- ((#:phases phases)
- #~(modify-phases #$phases
- (replace 'disable-failing-tests
- (lambda _
- ;; These tests fail only in the containerized environment, for
- ;; unknown reasons.
- (substitute* "testsuite/gtk/meson.build"
- ((".*\\['defaultvalue'],.*") "")
- ((".*\\['objects-finalize',.*") ""))
- ;; The 'flipping-icons.ui' and 'gtk-icontheme-sizing.ui' tests
- ;; fail for unknown reasons (see:
- ;; <https://gitlab.gnome.org/GNOME/gtk/-/issues/7679>).
- (substitute* "testsuite/reftests/meson.build"
- ((" 'flipping-icons.ui',.*") "")
- ((" 'gtk-icontheme-sizing.ui',.*") ""))))))))))
-
(define-public gtk
(package
(name "gtk")