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

Commits on Mar 9, 2019

  1. gtk3: Fix for missing symbols (again) 

    Was removed again in f9a62db, but it
was still needed after all, see #55692 (comment)
    @infinisil
    infinisil committed Mar 9, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    primeos Michael Weiss
    GPG key ID: 5BE487C4D4771D83
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e0cc49c View commit details

  2. Merge pull request #57095 from Infinisil/fix/gtk3-symbols 

    gtk3: Fix for missing symbols (again)
    @infinisil
    infinisil authored Mar 9, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3ea5f97 View commit details
Showing with 7 additions and 0 deletions.
  1. +7 −0 pkgs/development/libraries/gtk+/3.x.nix
7 changes: 7 additions & 0 deletions pkgs/development/libraries/gtk+/3.x.nix
View file
Original file line number Diff line number Diff line change
@@ -40,6 +40,13 @@ stdenv.mkDerivation rec {
url = https://github.com/gnome/gtk/compare/3.24.5..47e4a111c2666961ab47b6df48460d3c9075d92d.patch;
sha256 = "0ky4kmgcywg0qlwndn9aw083bkwnkr49bnlsz0ii93fxzvbiqglr";
})
(fetchpatch {
# https://gitlab.gnome.org/GNOME/gtk/merge_requests/505 already merged
# but isn't in 3.24.5
name = "export-missing-symbols.patch";
url = https://gitlab.gnome.org/GNOME/gtk/commit/95c0f07295fd300ab7f3416a39290ae33585ea6c.patch;
sha256 = "0z9w7f39xcn1cbcd8jhx731vq64nvi5q6kyc86bq8r00daysjwnl";
})
] ++ 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