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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e48720e67f6f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: de87dbfa0a05
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Oct 3, 2019

  1. gtk3: correct version in .pc file 

    They forgot to bump meson project version.
    @worldofpeace
    worldofpeace committed Oct 3, 2019
    Copy the full SHA
    89cba66 View commit details

  2. Merge pull request #70323 from worldofpeace/gtk-fix-pc 

    gtk3: correct version in .pc file
    @worldofpeace
    worldofpeace authored Oct 3, 2019
    Copy the full SHA
    de87dbf View commit details
Showing with 6 additions and 0 deletions.
  1. +6 −0 pkgs/development/libraries/gtk/3.x.nix
6 changes: 6 additions & 0 deletions pkgs/development/libraries/gtk/3.x.nix
View file
Original file line number Diff line number Diff line change
@@ -68,6 +68,12 @@ stdenv.mkDerivation rec {
})
# https://gitlab.gnome.org/GNOME/gtk/merge_requests/1002
./01-build-Fix-path-handling-in-pkgconfig.patch
# 3.32.11 had wrong version in .pc
# drop in next release
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gtk/commit/70c4b66d99f66b9da27ded63f2c26e3c13ce07f8.patch";
sha256 = "0nkc3y85wp5sn8xbr7c5zcpn9gsd5zcmdhjqwpmq54jwmg07fk52";
})
] ++ optionals stdenv.isDarwin [
# X11 module requires <gio/gdesktopappinfo.h> which is not installed on Darwin
# let’s drop that dependency in similar way to how other parts of the library do it