public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gtk3: 3.24.14 -> 3.24.17 (#84367)

Browse Source
This commit is contained in:
Tor Hedin Brønner 2020-04-06 02:19:15 +02:00 committed by GitHub
parent 5811d0c4b1
commit 91a20dac08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/gtk/3.x.nix
View File

@ -48,7 +48,7 @@ with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gtk+3"; pname = "gtk+3";
version = "3.24.14"; version = "3.24.17";
outputs = [ "out" "dev" ] ++ optional withGtkDoc "devdoc"; outputs = [ "out" "dev" ] ++ optional withGtkDoc "devdoc";
outputBin = "dev"; outputBin = "dev";
@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz";
sha256 = "120yz5gxqbv7sgdbcy4i0b6ixm8jpjzialdrqs0gv15q7bwnjk8w"; sha256 = "1h5snvqz8f6zgwpmq7pblvfwj5dphfckj8bv7vdz1c0w49dja47j";
}; };
patches = [ patches = [
@ -70,11 +70,7 @@ stdenv.mkDerivation rec {
url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123"; url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123";
sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p"; 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 # https://gitlab.gnome.org/GNOME/gtk/merge_requests/1002
./patches/01-build-Fix-path-handling-in-pkgconfig.patch ./patches/01-build-Fix-path-handling-in-pkgconfig.patch
] ++ optionals stdenv.isDarwin [ ] ++ optionals stdenv.isDarwin [