diff options
author | Anderson Torres <torres.anderson.85@gmail.com> | 2017-09-07 17:11:45 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-07 17:11:45 -0300 |
commit | 936dca89dfff53d362cfa9d7d09dd8acf6984cd8 (patch) | |
tree | eac792c10e8be2bd560e556e32ec9f042ad42523 /pkgs/desktops | |
parent | 5901a645a8b3b467035503dac5ba60d857f4d224 (diff) | |
parent | 4bfa7d891f6dc7f62a2213cc0dbc195e7f9f5cd9 (diff) | |
download | nixlib-936dca89dfff53d362cfa9d7d09dd8acf6984cd8.tar nixlib-936dca89dfff53d362cfa9d7d09dd8acf6984cd8.tar.gz nixlib-936dca89dfff53d362cfa9d7d09dd8acf6984cd8.tar.bz2 nixlib-936dca89dfff53d362cfa9d7d09dd8acf6984cd8.tar.lz nixlib-936dca89dfff53d362cfa9d7d09dd8acf6984cd8.tar.xz nixlib-936dca89dfff53d362cfa9d7d09dd8acf6984cd8.tar.zst nixlib-936dca89dfff53d362cfa9d7d09dd8acf6984cd8.zip |
Merge pull request #28969 from disassembler/xiphos
xiphos: 4.0.3 -> 4.0.6
Diffstat (limited to 'pkgs/desktops')
-rw-r--r-- | pkgs/desktops/gnome-2/default.nix | 2 | ||||
-rw-r--r-- | pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix | 15 |
2 files changed, 17 insertions, 0 deletions
diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index c6df2a9ebc22..4fec962f16d8 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -66,6 +66,8 @@ let overridden = set // overrides; set = with overridden; { gtkhtml = callPackage ./platform/gtkhtml { }; + gtkhtml4 = callPackage ./platform/gtkhtml/4.x.nix { }; + # Required for nautilus inherit (libunique); diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix new file mode 100644 index 000000000000..4525246c20ed --- /dev/null +++ b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix @@ -0,0 +1,15 @@ +{ stdenv, fetchurl, pkgconfig, gtk3, intltool, +GConf, enchant, isocodes, gnome_icon_theme, gsettings_desktop_schemas }: + +stdenv.mkDerivation rec { + version = "4.10.0"; + name = "gtkhtml-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/gtkhtml/4.10/${name}.tar.xz"; + sha256 = "1hq6asgb5n9q3ryx2vngr4jyi8lg65lzpnlgrgcwayiczcj68fya"; + }; + + propagatedBuildInputs = [ gsettings_desktop_schemas gtk3 gnome_icon_theme GConf ]; + buildInputs = [pkgconfig intltool enchant isocodes ]; +} |