diff options
author | Vladimír Čunát <v@cunat.cz> | 2023-10-26 10:36:50 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2023-10-26 10:36:50 +0200 |
commit | d811555465785e76fc06872f4bb14d4dd1dfed8c (patch) | |
tree | 91db30ffe3553dcd7c9766c4163687f7b951dd16 /pkgs/data | |
parent | 7054a80f3b8061bd532e407f46f60e484a5e9a9c (diff) | |
parent | 0f8647b0c2bce447f8ce27428de242727104ffb0 (diff) | |
download | nixpkgs-d811555465785e76fc06872f4bb14d4dd1dfed8c.tar nixpkgs-d811555465785e76fc06872f4bb14d4dd1dfed8c.tar.gz nixpkgs-d811555465785e76fc06872f4bb14d4dd1dfed8c.tar.bz2 nixpkgs-d811555465785e76fc06872f4bb14d4dd1dfed8c.tar.lz nixpkgs-d811555465785e76fc06872f4bb14d4dd1dfed8c.tar.xz nixpkgs-d811555465785e76fc06872f4bb14d4dd1dfed8c.tar.zst nixpkgs-d811555465785e76fc06872f4bb14d4dd1dfed8c.zip |
Merge branch 'staging' into staging-next
Diffstat (limited to 'pkgs/data')
-rw-r--r-- | pkgs/data/misc/shared-mime-info/default.nix | 10 | ||||
-rw-r--r-- | pkgs/data/misc/shared-mime-info/fix-clang-warnings.patch | 31 |
2 files changed, 39 insertions, 2 deletions
diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix index 197793db6c6..8de13f2eaf3 100644 --- a/pkgs/data/misc/shared-mime-info/default.nix +++ b/pkgs/data/misc/shared-mime-info/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "shared-mime-info"; - version = "2.2"; + version = "2.3"; outputs = [ "out" "dev" ]; @@ -23,9 +23,15 @@ stdenv.mkDerivation rec { owner = "xdg"; repo = pname; rev = version; - sha256 = "sha256-QrRe/DcjpTMejHXDSOLbjpJywod8qIjP6/leTZ21rhE="; + sha256 = "sha256-cEfknRVtOJykEO9Iqlb0UoiayYtu+ugvmmZqAD5cGnE="; }; + patches = [ + # Submitted upstream at + # https://gitlab.freedesktop.org/xdg/shared-mime-info/-/issues/211 + ./fix-clang-warnings.patch + ]; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/data/misc/shared-mime-info/fix-clang-warnings.patch b/pkgs/data/misc/shared-mime-info/fix-clang-warnings.patch new file mode 100644 index 00000000000..2d185549c4e --- /dev/null +++ b/pkgs/data/misc/shared-mime-info/fix-clang-warnings.patch @@ -0,0 +1,31 @@ +diff --git a/meson.build b/meson.build +index 1780c44..7998a51 100644 +--- a/meson.build ++++ b/meson.build +@@ -49,12 +49,7 @@ endif + ############################################################################### + # Dependencies + +-check_functions = [ +- 'fdatasync', +-] +-foreach function : check_functions +- config.set('HAVE_'+function.to_upper(), cc.has_function(function)) +-endforeach ++config.set('HAVE_FDATASYNC', cc.has_function('fdatasync', prefix: '#include <unistd.h>')) + + + if get_option('build-translations') +diff --git a/src/update-mime-database.cpp b/src/update-mime-database.cpp +index 733ba06..4ca6d06 100644 +--- a/src/update-mime-database.cpp ++++ b/src/update-mime-database.cpp +@@ -2158,7 +2158,7 @@ static void check_in_path_xdg_data(const char *mime_path) + + env = getenv("XDG_DATA_DIRS"); + if (!env) +- env = "/usr/local/share/"PATH_SEPARATOR"/usr/share/"; ++ env = "/usr/local/share/" PATH_SEPARATOR "/usr/share/"; + dirs = g_strsplit(env, PATH_SEPARATOR, 0); + g_return_if_fail(dirs != NULL); + for (n = 0; dirs[n]; n++) |