diff options
author | Tor Hedin Brønner <torhedinbronner@gmail.com> | 2020-04-06 02:19:15 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-06 02:19:15 +0200 |
commit | 91a20dac08ff1c2483befe90ccbd59c5b16aabde (patch) | |
tree | 3eca3ef3a97040d1eefdc8c68b752a89396e672e /pkgs/development/libraries/gtk | |
parent | 5811d0c4b15adaef3457e6573510a48432c689e7 (diff) | |
download | nixpkgs-91a20dac08ff1c2483befe90ccbd59c5b16aabde.tar nixpkgs-91a20dac08ff1c2483befe90ccbd59c5b16aabde.tar.gz nixpkgs-91a20dac08ff1c2483befe90ccbd59c5b16aabde.tar.bz2 nixpkgs-91a20dac08ff1c2483befe90ccbd59c5b16aabde.tar.lz nixpkgs-91a20dac08ff1c2483befe90ccbd59c5b16aabde.tar.xz nixpkgs-91a20dac08ff1c2483befe90ccbd59c5b16aabde.tar.zst nixpkgs-91a20dac08ff1c2483befe90ccbd59c5b16aabde.zip |
gtk3: 3.24.14 -> 3.24.17 (#84367)
Diffstat (limited to 'pkgs/development/libraries/gtk')
-rw-r--r-- | pkgs/development/libraries/gtk/3.x.nix | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index ac5a944334e..48b89c51772 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -48,7 +48,7 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "gtk+3"; - version = "3.24.14"; + version = "3.24.17"; outputs = [ "out" "dev" ] ++ optional withGtkDoc "devdoc"; outputBin = "dev"; @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; - sha256 = "120yz5gxqbv7sgdbcy4i0b6ixm8jpjzialdrqs0gv15q7bwnjk8w"; + sha256 = "1h5snvqz8f6zgwpmq7pblvfwj5dphfckj8bv7vdz1c0w49dja47j"; }; patches = [ @@ -70,11 +70,7 @@ stdenv.mkDerivation rec { url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123"; sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p"; }) - # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/1528 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/3c28751dee115e969a58a733f2f19e71062b9d2d.patch"; - sha256 = "1rqrmymwd22dsiy7agjw13mcyic3by6020rxyaw7zslnmyzfiwc3"; - }) + # https://gitlab.gnome.org/GNOME/gtk/merge_requests/1002 ./patches/01-build-Fix-path-handling-in-pkgconfig.patch ] ++ optionals stdenv.isDarwin [ |