diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2018-03-10 14:41:34 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2018-03-10 20:38:13 +0000 |
| commit | 7079e744d4666db3af186899fe2fc0ef3cbeb842 (patch) | |
| tree | d65e951be75dab998ecd2e8337e1c30e7722e28c /pkgs/development/libraries/gtk+ | |
| parent | 4eec6bc9c9cafac55dbf774a2fd30da7e5a79cc4 (diff) | |
| parent | ddddca5c2fe1c93369404979ac194a1bc5d5fbaf (diff) | |
| download | nixlib-7079e744d4666db3af186899fe2fc0ef3cbeb842.tar nixlib-7079e744d4666db3af186899fe2fc0ef3cbeb842.tar.gz nixlib-7079e744d4666db3af186899fe2fc0ef3cbeb842.tar.bz2 nixlib-7079e744d4666db3af186899fe2fc0ef3cbeb842.tar.lz nixlib-7079e744d4666db3af186899fe2fc0ef3cbeb842.tar.xz nixlib-7079e744d4666db3af186899fe2fc0ef3cbeb842.tar.zst nixlib-7079e744d4666db3af186899fe2fc0ef3cbeb842.zip | |
Merge branch 'master' into staging
Resolved the following conflicts (by carefully applying patches from the both branches since the fork point): pkgs/development/libraries/epoxy/default.nix pkgs/development/libraries/gtk+/3.x.nix pkgs/development/python-modules/asgiref/default.nix pkgs/development/python-modules/daphne/default.nix pkgs/os-specific/linux/systemd/default.nix
Diffstat (limited to 'pkgs/development/libraries/gtk+')
| -rw-r--r-- | pkgs/development/libraries/gtk+/3.x.nix | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 0f95cf7f3c66..189af86708ef 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -11,16 +11,12 @@ assert cupsSupport -> cups != null; with stdenv.lib; -let - ver_maj = "3.22"; - ver_min = "28"; - version = "${ver_maj}.${ver_min}"; -in stdenv.mkDerivation rec { name = "gtk+3-${version}"; + version = "3.22.28"; src = fetchurl { - url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz"; + url = "mirror://gnome/sources/gtk+/${gnome3.versionBranch version}/gtk+-${version}.tar.xz"; sha256 = "d299612b018cfed7b2c689168ab52b668023708e17c335eb592260d186f15e1f"; }; @@ -76,6 +72,13 @@ stdenv.mkDerivation rec { moveToOutput bin/gtk-launch "$out" ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = "gtk+"; + attrPath = "gtk3"; + }; + }; + meta = with stdenv.lib; { description = "A multi-platform toolkit for creating graphical user interfaces"; |