diff options
| author | Bobby Rong <rjl931189261@126.com> | 2023-03-10 16:21:51 +0800 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2023-04-06 01:35:15 +0200 |
| commit | f441c242d2ea71e8f704f464030875f772eafe7a (patch) | |
| tree | d2652f4cfe992a594cf873b64a9eae6aa3fccb76 /pkgs/tools/misc/desktop-file-utils | |
| parent | 0c35dfccb99cb0592e2a93c7d7007aa831924910 (diff) | |
| download | nixpkgs-f441c242d2ea71e8f704f464030875f772eafe7a.tar nixpkgs-f441c242d2ea71e8f704f464030875f772eafe7a.tar.gz nixpkgs-f441c242d2ea71e8f704f464030875f772eafe7a.tar.bz2 nixpkgs-f441c242d2ea71e8f704f464030875f772eafe7a.tar.lz nixpkgs-f441c242d2ea71e8f704f464030875f772eafe7a.tar.xz nixpkgs-f441c242d2ea71e8f704f464030875f772eafe7a.tar.zst nixpkgs-f441c242d2ea71e8f704f464030875f772eafe7a.zip | |
desktop-file-utils: Support Desktop Entry Specification v1.5
The gnome-terminal desktop file validation fails otherwise.
Diffstat (limited to 'pkgs/tools/misc/desktop-file-utils')
| -rw-r--r-- | pkgs/tools/misc/desktop-file-utils/default.nix | 38 |
1 files changed, 34 insertions, 4 deletions
diff --git a/pkgs/tools/misc/desktop-file-utils/default.nix b/pkgs/tools/misc/desktop-file-utils/default.nix index 597eced414f..218eed5eb8b 100644 --- a/pkgs/tools/misc/desktop-file-utils/default.nix +++ b/pkgs/tools/misc/desktop-file-utils/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchurl, pkg-config, meson, ninja, glib, libintl }: +{ stdenv +, lib +, fetchurl +, fetchpatch +, pkg-config +, meson +, ninja +, glib +, libintl +}: stdenv.mkDerivation rec { pname = "desktop-file-utils"; @@ -9,8 +18,29 @@ stdenv.mkDerivation rec { sha256 = "02bkfi6fyk4c0gh2avd897882ww5zl7qg7bzzf28qb57kvkvsvdj"; }; - nativeBuildInputs = [ pkg-config meson ninja ]; - buildInputs = [ glib libintl ]; + patches = [ + # Support Desktop Entry Specification v1.5. + # https://gitlab.freedesktop.org/xdg/desktop-file-utils/-/merge_requests/11 + (fetchpatch { + url = "https://gitlab.freedesktop.org/xdg/desktop-file-utils/-/commit/425177a28b6215e0745f95100160a08e810fd47c.patch"; + sha256 = "zu9EqTnQQGi5HqKh431JqigtJi+b16RuXSWQYbuuyxA="; + }) + (fetchpatch { + url = "https://gitlab.freedesktop.org/xdg/desktop-file-utils/-/commit/56d220dd679c7c3a8f995a41a27a7d6f3df49dea.patch"; + sha256 = "p4kamGIm2QBHfIbvDnx+qu5Gi7OU3Z0nQKr39SsEKqk="; + }) + ]; + + nativeBuildInputs = [ + pkg-config + meson + ninja + ]; + + buildInputs = [ + glib + libintl + ]; postPatch = '' substituteInPlace src/install.c \ @@ -23,6 +53,6 @@ stdenv.mkDerivation rec { homepage = "http://www.freedesktop.org/wiki/Software/desktop-file-utils"; description = "Command line utilities for working with .desktop files"; platforms = platforms.linux ++ platforms.darwin; - license = licenses.gpl2; + license = licenses.gpl2Plus; }; } |