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

Commits on Mar 10, 2019

  1. Merge #57095: gtk3: Fix for missing symbols (again) 

    (cherry picked from commit 3ea5f97)
Forward-picking from staging to staging-next.  It seems quite
an important fix with little risk of breakage, and it isn't such a huge
rebuild, especially considering the unfinished amount on staging-next ATM.
    @infinisil @vcunat
    infinisil authored and vcunat committed Mar 10, 2019
    Copy the full SHA
    2206a3e 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