···

       
1
       
1
       
 
       
{ stdenv

     

       
2
       
2
       
 
       
, lib

     

       
3
       
3
       
 
       
, fetchFromGitLab

     

       
4
       
4
       
-
       
, fetchpatch

     

       
5
       
4
       
 
       
, meson

     

       
6
       
5
       
 
       
, ninja

     

       
7
       
6
       
 
       
, pkg-config

     
···

       
14
       
13
       
 
       


     

       
15
       
14
       
 
       
stdenv.mkDerivation rec {

     

       
16
       
15
       
 
       
  pname = "shared-mime-info";

     

       
17
       
17
       
-
       
  version = "2.3";

     

       
16
       
16
       
+
       
  version = "2.4";

     

       
18
       
17
       
 
       


     

       
19
       
18
       
 
       
  outputs = [ "out" "dev" ];

     

       
20
       
19
       
 
       


     
···

       
23
       
22
       
 
       
    owner = "xdg";

     

       
24
       
23
       
 
       
    repo = pname;

     

       
25
       
24
       
 
       
    rev = version;

     

       
26
       
26
       
-
       
    sha256 = "sha256-cEfknRVtOJykEO9Iqlb0UoiayYtu+ugvmmZqAD5cGnE=";

     

       
25
       
25
       
+
       
    hash = "sha256-5eyMkfSBUOD7p8woIYTgz5C/L8uQMXyr0fhL0l23VMA=";

     

       
27
       
26
       
 
       
  };

     

       
28
       
28
       
-
       


     

       
29
       
29
       
-
       
  patches = [

     

       
30
       
30
       
-
       
    # Submitted upstream at

     

       
31
       
31
       
-
       
    # https://gitlab.freedesktop.org/xdg/shared-mime-info/-/issues/211

     

       
32
       
32
       
-
       
    ./fix-clang-warnings.patch

     

       
33
       
33
       
-
       
  ];

     

       
34
       
27
       
 
       


     

       
35
       
28
       
 
       
  nativeBuildInputs = [

     

       
36
       
29
       
 
       
    meson

     

···

       
1
       
1
       
-
       
diff --git a/meson.build b/meson.build

     

       
2
       
2
       
-
       
index 1780c44..7998a51 100644

     

       
3
       
3
       
-
       
--- a/meson.build

     

       
4
       
4
       
-
       
+++ b/meson.build

     

       
5
       
5
       
-
       
@@ -49,12 +49,7 @@ endif

     

       
6
       
6
       
-
       
 ###############################################################################

     

       
7
       
7
       
-
       
 # Dependencies

     

       
8
       
8
       
-
       
 

     

       
9
       
9
       
-
       
-check_functions = [

     

       
10
       
10
       
-
       
-    'fdatasync',

     

       
11
       
11
       
-
       
-]

     

       
12
       
12
       
-
       
-foreach function : check_functions

     

       
13
       
13
       
-
       
-    config.set('HAVE_'+function.to_upper(), cc.has_function(function))

     

       
14
       
14
       
-
       
-endforeach

     

       
15
       
15
       
-
       
+config.set('HAVE_FDATASYNC', cc.has_function('fdatasync', prefix: '#include <unistd.h>'))

     

       
16
       
16
       
-
       
 

     

       
17
       
17
       
-
       
 

     

       
18
       
18
       
-
       
 if get_option('build-translations')

     

       
19
       
19
       
-
       
diff --git a/src/update-mime-database.cpp b/src/update-mime-database.cpp

     

       
20
       
20
       
-
       
index 733ba06..4ca6d06 100644

     

       
21
       
21
       
-
       
--- a/src/update-mime-database.cpp

     

       
22
       
22
       
-
       
+++ b/src/update-mime-database.cpp

     

       
23
       
23
       
-
       
@@ -2158,7 +2158,7 @@ static void check_in_path_xdg_data(const char *mime_path)

     

       
24
       
24
       
-
       
 

     

       
25
       
25
       
-
       
 	env = getenv("XDG_DATA_DIRS");

     

       
26
       
26
       
-
       
 	if (!env)

     

       
27
       
27
       
-
       
-		env = "/usr/local/share/"PATH_SEPARATOR"/usr/share/";

     

       
28
       
28
       
-
       
+		env = "/usr/local/share/" PATH_SEPARATOR "/usr/share/";

     

       
29
       
29
       
-
       
 	dirs = g_strsplit(env, PATH_SEPARATOR, 0);

     

       
30
       
30
       
-
       
 	g_return_if_fail(dirs != NULL);

     

       
31
       
31
       
-
       
 	for (n = 0; dirs[n]; n++)