diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2016-10-06 09:51:02 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-10-06 09:51:02 -0500 |
| commit | 2e255a2edddfe5ca0e44f55d6e4bd82737cbb884 (patch) | |
| tree | c785d80650dc2d074244525401246fc6ef07a468 /pkgs/development/libraries/gtk+ | |
| parent | e3deccc0d7a42b0ae1d5e337cd6b0b9488c2295a (diff) | |
| parent | 16dafb018e09363bfae3949a8261c18ee7880781 (diff) | |
| download | nixlib-2e255a2edddfe5ca0e44f55d6e4bd82737cbb884.tar nixlib-2e255a2edddfe5ca0e44f55d6e4bd82737cbb884.tar.gz nixlib-2e255a2edddfe5ca0e44f55d6e4bd82737cbb884.tar.bz2 nixlib-2e255a2edddfe5ca0e44f55d6e4bd82737cbb884.tar.lz nixlib-2e255a2edddfe5ca0e44f55d6e4bd82737cbb884.tar.xz nixlib-2e255a2edddfe5ca0e44f55d6e4bd82737cbb884.tar.zst nixlib-2e255a2edddfe5ca0e44f55d6e4bd82737cbb884.zip | |
Merge branch 'staging'
Diffstat (limited to 'pkgs/development/libraries/gtk+')
| -rw-r--r-- | pkgs/development/libraries/gtk+/2.x.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/gtk+/3.x.nix | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index df645f109613..91407e556c05 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -44,6 +44,8 @@ stdenv.mkDerivation rec { postInstall = '' moveToOutput share/gtk-2.0/demo "$devdoc" + # The updater is needed for nixos env and it's tiny. + moveToOutput bin/gtk-update-icon-cache "$out" ''; passthru = { diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index df223688d46d..9882cd7692c1 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -12,8 +12,8 @@ assert cupsSupport -> cups != null; with stdenv.lib; let - ver_maj = "3.20"; - ver_min = "9"; + ver_maj = "3.22"; + ver_min = "1"; version = "${ver_maj}.${ver_min}"; in stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz"; - sha256 = "05xcwvy68p7f4hdhi4bgdm3aycvqqr4pr5kkkr8ba91l5yx0k9l3"; + sha256 = "127c8c5cfc32681f9ab3cb542eb0d5c16c1c02faba68bf8fcac9a3cf278ef471"; }; outputs = [ "out" "dev" ]; |