diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-08-08 16:04:42 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-08-13 06:35:37 +0000 |
| commit | 12aaa58dac35800b5b7d77f81cf2a87c21ee55da (patch) | |
| tree | be0add9e5c22a85d20b5d78206aa74f956eb2a1b /nixpkgs/pkgs/development/libraries/libdbusmenu | |
| parent | 45892a5591202f75a1c2f1ca7c62a92c7566e3c5 (diff) | |
| parent | 5a8e9243812ba528000995b294292d3b5e120947 (diff) | |
| download | nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.gz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.bz2 nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.lz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.xz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.zst nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix Link: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/391
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libdbusmenu')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libdbusmenu/default.nix | 4 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libdbusmenu/requires-glib.patch | 11 |
2 files changed, 15 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libdbusmenu/default.nix b/nixpkgs/pkgs/development/libraries/libdbusmenu/default.nix index 9efea659a651..5143372d2b0d 100644 --- a/nixpkgs/pkgs/development/libraries/libdbusmenu/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdbusmenu/default.nix @@ -27,6 +27,10 @@ stdenv.mkDerivation (finalAttrs: { "3" = gtk3; }.${gtkVersion} or (throw "unknown GTK version ${gtkVersion}"); + patches = [ + ./requires-glib.patch + ]; + postPatch = '' for f in {configure,ltmain.sh,m4/libtool.m4}; do substituteInPlace $f \ diff --git a/nixpkgs/pkgs/development/libraries/libdbusmenu/requires-glib.patch b/nixpkgs/pkgs/development/libraries/libdbusmenu/requires-glib.patch new file mode 100644 index 000000000000..53cad2cf018f --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libdbusmenu/requires-glib.patch @@ -0,0 +1,11 @@ +--- a/libdbusmenu-glib/dbusmenu-glib-0.4.pc.in ++++ b/libdbusmenu-glib/dbusmenu-glib-0.4.pc.in +@@ -5,7 +5,7 @@ + includedir=@includedir@ + + Cflags: -I${includedir}/libdbusmenu-glib-0.4 +-Requires: ++Requires: glib-2.0 + Libs: -L${libdir} -ldbusmenu-glib + + Name: libdbusmenu-glib |