Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 957e879f7808
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 53bfd2c7ec14
Choose a head ref
  • 4 commits
  • 6 files changed
  • 1 contributor

Commits on Sep 21, 2019

  1. libunity: fix build with latest vala 

    See: https://gitlab.gnome.org/GNOME/vala/issues/766
    @worldofpeace
    worldofpeace committed Sep 21, 2019
    Copy the full SHA
    3e808f2 View commit details
    Browse the repository at this point in the history

  2. feedreader: fix build with latest libsecret

    @worldofpeace
    worldofpeace committed Sep 21, 2019
    Copy the full SHA
    eddb55b View commit details
    Browse the repository at this point in the history

  3. midori: 7 -> 9.0 

    * add libarchive and json-glib

We use vala_0_44 to avoid the issue with sqlite3 vapi [0]

[0]: https://gitlab.gnome.org/GNOME/vala/commit/a54e4d89a449044c965869abf0ce78dadcf093ac.patch
    @worldofpeace
    worldofpeace committed Sep 21, 2019
    Copy the full SHA
    0acc5a9 View commit details
    Browse the repository at this point in the history

  4. libpeas: correct gtk .pc file 

    Here's the diff post meson:
-prefix=/nix/store/hfrrby8wapcz17v927as18z3znqdv2ps-libpeas-1.22.0
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+prefix=/nix/store/sc8h3m6fv3zdjzpkimhm4yqarafhjp6y-libpeas-1.24.0
+libdir=${prefix}/lib
 includedir=${prefix}/include

-Name: libpeas-gtk
-Description: libpeas-gtk, a GObject plugins library (Gtk widgets)
-Requires: glib-2.0 >= 2.38.0, gtk+-3.0 >= 3.0.0, libpeas-1.0 >= 1.22.0
-Version: 1.22.0
+Name: libpeas-gtk-1.0
+Description: GObject plugins library widgetery
+Version: 1.24.0
+Requires.private: libpeas-1.0, glib-2.0 >=  2.38.0, gobject-2.0 >=  2.38.0, gobject-introspection-1.0 >=  1.39.0, gtk+-3.0 >=  3.0.0, gmodule-2.0 >=  2.38.0, gio-2.0 >=  2.38.0
+Libs: -L${prefix}//lib  -lpeas-gtk-1.0
 Cflags: -I${includedir}/libpeas-1.0
-Libs: -L${libdir} -lpeas-gtk-1.0

As we can see, all the requires got moved into private.
This appears to have broken midori [0]

[0]: https://hydra.nixos.org/build/101627205
    @worldofpeace
    worldofpeace committed Sep 21, 2019
    Copy the full SHA
    53bfd2c View commit details
    Browse the repository at this point in the history