diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-04-27 21:04:56 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-04-27 21:04:56 +0000 |
commit | a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e (patch) | |
tree | 47950e79183035018882419c4eff5047d1537b99 /nixpkgs/pkgs/development/libraries/gtk | |
parent | 5b00523fb58512232b819a301c4309f579c7f09c (diff) | |
parent | 22a3bf9fb9edad917fb6cd1066d58b5e426ee975 (diff) | |
download | nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.gz nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.bz2 nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.lz nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.xz nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.zst nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.zip |
Merge commit '22a3bf9fb9edad917fb6cd1066d58b5e426ee975'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/gtk')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/gtk/2.x.nix | 4 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/gtk/3.x.nix | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/libraries/gtk/2.x.nix b/nixpkgs/pkgs/development/libraries/gtk/2.x.nix index 932527eed092..09cb016dbb6a 100644 --- a/nixpkgs/pkgs/development/libraries/gtk/2.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtk/2.x.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ./patches/gtk2-theme-paths.patch ] ++ optionals stdenv.isDarwin [ (fetchpatch { - url = https://bug557780.bugzilla-attachments.gnome.org/attachment.cgi?id=306776; + url = "https://bug557780.bugzilla-attachments.gnome.org/attachment.cgi?id=306776"; sha256 = "0sp8f1r5c4j2nlnbqgv7s7nxa4cfwigvm033hvhb1ld652pjag4r"; }) ./patches/2.0-darwin-x11.patch @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { meta = { description = "A multi-platform toolkit for creating graphical user interfaces"; - homepage = https://www.gtk.org/; + homepage = "https://www.gtk.org/"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ lovek323 raskin ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/libraries/gtk/3.x.nix b/nixpkgs/pkgs/development/libraries/gtk/3.x.nix index 9f381c5ac708..812f4faa2341 100644 --- a/nixpkgs/pkgs/development/libraries/gtk/3.x.nix +++ b/nixpkgs/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,6 +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/1002 ./patches/01-build-Fix-path-handling-in-pkgconfig.patch ] ++ optionals stdenv.isDarwin [ @@ -198,7 +199,7 @@ stdenv.mkDerivation rec { proprietary software with GTK without any license fees or royalties. ''; - homepage = https://www.gtk.org/; + homepage = "https://www.gtk.org/"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ raskin vcunat lethalman worldofpeace ]; platforms = platforms.all; |