diff options
| author | Rouven Czerwinski <rouven@czerwinskis.de> | 2020-12-16 16:44:02 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2020-12-17 07:33:45 +0100 |
| commit | 5c6ed7b233d6936da2f80e35a2b8091c03c7967a (patch) | |
| tree | 70553955a9324e2642275789f893d26087004a12 /pkgs/development/libraries/gtk/3.x.nix | |
| parent | 68fdbc6be1f90409fe602fb97741ee358791826c (diff) | |
| download | nixpkgs-5c6ed7b233d6936da2f80e35a2b8091c03c7967a.tar nixpkgs-5c6ed7b233d6936da2f80e35a2b8091c03c7967a.tar.gz nixpkgs-5c6ed7b233d6936da2f80e35a2b8091c03c7967a.tar.bz2 nixpkgs-5c6ed7b233d6936da2f80e35a2b8091c03c7967a.tar.lz nixpkgs-5c6ed7b233d6936da2f80e35a2b8091c03c7967a.tar.xz nixpkgs-5c6ed7b233d6936da2f80e35a2b8091c03c7967a.tar.zst nixpkgs-5c6ed7b233d6936da2f80e35a2b8091c03c7967a.zip | |
gtk3: 3.24.23 -> 3.24.24
Remove an old patch. Includes support for upstream primary selection protocol, fixing primary selection for sway on the master branch.
Diffstat (limited to 'pkgs/development/libraries/gtk/3.x.nix')
| -rw-r--r-- | pkgs/development/libraries/gtk/3.x.nix | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index aee846ccfcd..654ad3116a4 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -51,7 +51,7 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "gtk+3"; - version = "3.24.23"; + version = "3.24.24"; outputs = [ "out" "dev" ] ++ optional withGtkDoc "devdoc"; outputBin = "dev"; @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; - sha256 = "1cg2vbwbcp7bc84ky0b69ipgdr9djhspnf5k8lajb8jphcj4v1jx"; + sha256 = "12ipk1d376bai9v820qzhxba93kkh5abi6mhyqr4hwjvqmkl77fc"; }; patches = [ @@ -73,13 +73,6 @@ stdenv.mkDerivation rec { url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123"; sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p"; }) - - # Fix path handling in pkg-config. MR for the gtk-3-24 branch: - # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2605 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gtk/commit/6d9db8610eff8c12d594d53b7813d9eea1247801.patch"; - sha256 = "0rd1kjh0m4mrj2hkcqlsq1j0d6ahn5c237fd211r158gd1jiwys0"; - }) ] ++ 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 |