diff options
author | Joachim F <joachifm@users.noreply.github.com> | 2016-07-30 14:00:29 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-30 14:00:29 +0200 |
commit | 29739ece1f1e6a7602207ff03273f6a59907f322 (patch) | |
tree | b5a0c6f3da1757190a343bbb4444135920179f1c | |
parent | aa69c4a5df941373121b4b829df141e2332ab078 (diff) | |
parent | 83251cdd60485d8c55d7ba6cc21d9f63dc6167f8 (diff) | |
download | nixpkgs-29739ece1f1e6a7602207ff03273f6a59907f322.tar nixpkgs-29739ece1f1e6a7602207ff03273f6a59907f322.tar.gz nixpkgs-29739ece1f1e6a7602207ff03273f6a59907f322.tar.bz2 nixpkgs-29739ece1f1e6a7602207ff03273f6a59907f322.tar.lz nixpkgs-29739ece1f1e6a7602207ff03273f6a59907f322.tar.xz nixpkgs-29739ece1f1e6a7602207ff03273f6a59907f322.tar.zst nixpkgs-29739ece1f1e6a7602207ff03273f6a59907f322.zip |
Merge pull request #17376 from mimadrid/update/meld-3.16.2
meld: 3.16.1 -> 3.16.2
-rw-r--r-- | pkgs/applications/version-management/meld/default.nix | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 3da377414d4..99e45438984 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, itstool, buildPythonApplication, python27, intltool, makeWrapper -, libxml2, pygobject3, gobjectIntrospection, gtk3, gnome3, pycairo, cairo +{ stdenv, fetchurl, itstool, buildPythonApplication, python27, intltool, wrapGAppsHook +, libxml2, pygobject3, gobjectIntrospection, gtk3, gnome3, pycairo, cairo, file }: let minor = "3.16"; - version = "${minor}.1"; + version = "${minor}.2"; in buildPythonApplication rec { @@ -14,13 +14,13 @@ buildPythonApplication rec { src = fetchurl { url = "mirror://gnome/sources/meld/${minor}/meld-${version}.tar.xz"; - sha256 = "1bec697aa1ababa315ca8241ade65dc68ea87f0d316632f590975afcf967cfab"; + sha256 = "2dd3f58b95444bf721e0c912668c29cf8f47a402440b772ea12c4b9a0c94966f"; }; buildInputs = [ - python27 intltool makeWrapper itstool libxml2 + python27 intltool wrapGAppsHook itstool libxml2 gnome3.gtksourceview gnome3.gsettings_desktop_schemas pycairo cairo - gnome3.defaultIconTheme + gnome3.defaultIconTheme gnome3.dconf file ]; propagatedBuildInputs = [ gobjectIntrospection pygobject3 gtk3 ]; @@ -37,13 +37,6 @@ buildPythonApplication rec { mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name/ ''; - preFixup = '' - wrapProgram $out/bin/meld \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" \ - --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" - ''; - patchPhase = '' patchShebangs bin/meld ''; |