gnome3: 3.26 → 3.28 #36893
Merged
gnome3: 3.26 → 3.28 #36893
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@GrahamcOfBorg eval |
GrahamcOfBorg
added
6.topic: GNOME
jtojnar
force-pushed
the
gnome-3.28
branch
2 times, most recently
from
3f95ae6
to
55fcbdb
Compare
GrahamcOfBorg
added
10.rebuild-darwin: 501+
and removed
10.rebuild-darwin: 101-500
labels
|
Looks like |
|
Epiphany took the thumbnailing code from |
|
Something like this is needed for diff --git a/pkgs/desktops/gnome-3/core/libgweather/default.nix b/pkgs/desktops/gnome-3/core/libgweather/default.nix
index 1d38b75bcda..53236c15086 100644
--- a/pkgs/desktops/gnome-3/core/libgweather/default.nix
+++ b/pkgs/desktops/gnome-3/core/libgweather/default.nix
@@ -1,5 +1,6 @@
{ stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, libsoup, gconf
-, pango, gdk_pixbuf, atk, tzdata, gnome3 }:
+, pango, gdk_pixbuf, atk, tzdata, gnome3
+, meson, ninja, gobjectIntrospection }:
stdenv.mkDerivation rec {
name = "libgweather-${version}";
@@ -15,12 +16,13 @@ stdenv.mkDerivation rec {
};
configureFlags = [ "--with-zoneinfo-dir=${tzdata}/share/zoneinfo" "--enable-vala" ];
- propagatedBuildInputs = [ libxml2 gtk libsoup gconf pango gdk_pixbuf atk gnome3.geocode-glib ];
- nativeBuildInputs = [ pkgconfig intltool gnome3.vala ];
+ propagatedBuildInputs = [ libxml2 gtk libsoup gconf pango gdk_pixbuf atk gnome3.geocode-glib
+ gobjectIntrospection ];
+ nativeBuildInputs = [ pkgconfig meson ninja intltool gnome3.vala ];
- # Prevent building vapi into ${vala} derivation directory
- prePatch = ''
- substituteInPlace libgweather/Makefile.in --replace "\$(DESTDIR)\$(vapidir)" "\$(DESTDIR)\$(girdir)/../vala/vapi"
+ postPatch = ''
+ chmod +x meson/meson_post_install.py
+ patchShebangs meson/meson_post_install.py
'';
meta = with stdenv.lib; { |
|
|
|
There will be a lot of packages with missing I also merged #35513 and #36326, which are necessary for more complex meson projects. Anyway, we now have a Hydra jobset https://hydra.nixos.org/jobset/nixpkgs/gnome so hopefully this will go faster. |
|
Makefiles are not used with meson so the substitution can be dropped. |
|
This gets Three problems I encountered:
I worked around 1. and 2. with patches that hardcode the certificate path and install Not sure how to replicate |
|
Just noting some things down as I look through the hydra failures :
|
|
@GrahamcOfBorg build glib-networking |
|
Success on x86_64-darwin (full log) Attempted: glib-networking Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: glib-networking Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: glib-networking Partial log (click to expand)
|
jtojnar
force-pushed
the
gnome-3.28
branch
3 times, most recently
from
4eeb9c3
to
01f4ab3
Compare
Try to fix `imports.gi.NMA`
Rename `gnome-tweak-tool` to `gnome-tweaks`.
This was referenced Mar 22, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Depends on #36326, #35513, #37050, #36312.
There will be a lot of packages with missing
meson. I also removedgobjectIntrospectionfromlibsoup’spropagatedBuildInputs, so it might be needed in more places.Changelogs checked
Packages missing
Broken packages
Things done
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)Hydra jobset: https://hydra.nixos.org/jobset/nixpkgs/gnome