diff options
author | worldofpeace <worldofpeace@protonmail.ch> | 2019-09-21 18:46:31 -0400 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2019-10-03 00:09:14 +0200 |
commit | dac8bf9ed5bbbcac38a8091c1234f79bc98e2678 (patch) | |
tree | 87e1a135f7debb076782da439dfdd0d8dfd60c50 /pkgs/development/libraries/libpeas | |
parent | 1252132f080e6c0d8246b9d511cebb55e5642e20 (diff) |
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
Diffstat (limited to 'pkgs/development/libraries/libpeas')
-rw-r--r-- | pkgs/development/libraries/libpeas/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/libpeas/fix-libpeas-gtk-pc.patch | 22 |
2 files changed, 26 insertions, 0 deletions
diff --git a/pkgs/development/libraries/libpeas/default.nix b/pkgs/development/libraries/libpeas/default.nix index beee52f8217c..cdb1b95935f4 100644 --- a/pkgs/development/libraries/libpeas/default.nix +++ b/pkgs/development/libraries/libpeas/default.nix @@ -18,6 +18,10 @@ stdenv.mkDerivation rec { gobject-introspection ]; + patches = [ + ./fix-libpeas-gtk-pc.patch + ]; + passthru = { updateScript = gnome3.updateScript { packageName = pname; diff --git a/pkgs/development/libraries/libpeas/fix-libpeas-gtk-pc.patch b/pkgs/development/libraries/libpeas/fix-libpeas-gtk-pc.patch new file mode 100644 index 000000000000..8016939716d9 --- /dev/null +++ b/pkgs/development/libraries/libpeas/fix-libpeas-gtk-pc.patch @@ -0,0 +1,22 @@ +diff --git a/libpeas-gtk/meson.build b/libpeas-gtk/meson.build +index bf590de..00def42 100644 +--- a/libpeas-gtk/meson.build ++++ b/libpeas-gtk/meson.build +@@ -111,10 +111,17 @@ libpeas_gtk_test_dep = declare_dependency( + sources: libpeas_gtk_dep_sources, + ) + ++libpeas_gtk_pc_reqs = [ ++ glib_dep, ++ gtk_dep, ++ package_string + ' >= @0@'.format(version) ++] ++ + libpeas_gtk_pc = pkg.generate( + libpeas_gtk_sha, + name: package_gtk_string, + description: 'GObject plugins library widgetery', ++ requires: libpeas_gtk_pc_reqs, + subdirs: package_string, + install_dir: pkgconfigdir, + ) |