Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs

Conflicts:
	nixpkgs/pkgs/applications/window-managers/sway/default.nix
	nixpkgs/pkgs/build-support/go/module.nix
	nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
	nixpkgs/pkgs/development/libraries/mesa/default.nix
	nixpkgs/pkgs/servers/dict/dictd-db.nix

Link: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/391

3 files changed, 16 insertions, 19 deletions

diff --git a/nixpkgs/pkgs/development/libraries/malcontent/better-separation.patch b/nixpkgs/pkgs/development/libraries/malcontent/better-separation.patch
index ef42650e249d..24effe9dde04 100644
--- a/nixpkgs/pkgs/development/libraries/malcontent/better-separation.patch
+++ b/nixpkgs/pkgs/development/libraries/malcontent/better-separation.patch
@@ -1,4 +1,4 @@
-commit 363c5be465dd6dde35c3d31abd7b5cca9b1f3a9f
+commit 05666e70f1ef63632aea8b1aed84351a6e30d0d5
 Author: Jan Tojnar <jtojnar@gmail.com>
 Date:   Thu Jul 23 18:49:03 2020 +0200
 
@@ -22,7 +22,7 @@ Date:   Thu Jul 23 18:49:03 2020 +0200
     https://gitlab.freedesktop.org/pwithnall/malcontent/merge_requests/38#note_437946
 
 diff --git a/meson.build b/meson.build
-index 6e1dfa5..196350b 100644
+index 038dd35..e3c77f0 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -123,9 +123,8 @@ test_env = [
@@ -36,8 +36,8 @@ index 6e1dfa5..196350b 100644
    subdir('libmalcontent')
  else
    libmalcontent_api_version = '0'
-@@ -136,11 +135,16 @@ endif
- if get_option('ui').enabled()
+@@ -143,14 +142,19 @@ if get_option('ui').enabled()
+   )
    subdir('libmalcontent-ui')
  endif
 -subdir('malcontent-client')
@@ -47,12 +47,15 @@ index 6e1dfa5..196350b 100644
  if get_option('ui').enabled()
    subdir('malcontent-control')
 +  subdir('help')
-+endif
-+if not get_option('use_system_libmalcontent')
-+  subdir('pam')
-+  subdir('po')
+ 
+   gnome.post_install(
+     gtk_update_icon_cache: true,
+     update_desktop_database: true,
+   )
  endif
 -subdir('pam')
 -subdir('po')
- 
- meson.add_install_script('build-aux/meson_post_install.py')
++if not get_option('use_system_libmalcontent')
++  subdir('pam')
++  subdir('po')
++endif
diff --git a/nixpkgs/pkgs/development/libraries/malcontent/default.nix b/nixpkgs/pkgs/development/libraries/malcontent/default.nix
index 92ec23542883..d897230f8f37 100644
--- a/nixpkgs/pkgs/development/libraries/malcontent/default.nix
+++ b/nixpkgs/pkgs/development/libraries/malcontent/default.nix
@@ -19,16 +19,16 @@
 
 stdenv.mkDerivation rec {
   pname = "malcontent";
-  version = "0.11.0";
+  version = "0.11.1";
 
   outputs = [ "bin" "out" "lib" "pam" "dev" "man" "installedTests" ];
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "pwithnall";
-    repo = pname;
+    repo = "malcontent";
     rev = version;
-    sha256 = "sha256-92F30DfdSJvO5C9EmNtiC/H6Fa6qQHecYSx59JKp8vA=";
+    hash = "sha256-NZwVCnQrEG2gecUjuWe1+cyWFR3OdYJCmj87V14Uwjw=";
   };
 
   patches = [
diff --git a/nixpkgs/pkgs/development/libraries/malcontent/ui.nix b/nixpkgs/pkgs/development/libraries/malcontent/ui.nix
index 8969d1e13428..59950a75c745 100644
--- a/nixpkgs/pkgs/development/libraries/malcontent/ui.nix
+++ b/nixpkgs/pkgs/development/libraries/malcontent/ui.nix
@@ -66,12 +66,6 @@ stdenv.mkDerivation rec {
     "-Dui=enabled"
   ];
 
-  postPatch = ''
-    # https://gitlab.freedesktop.org/pwithnall/malcontent/-/merge_requests/148
-    substituteInPlace build-aux/meson_post_install.py \
-      --replace gtk-update-icon-cache gtk4-update-icon-cache
-  '';
-
   meta = with lib; {
     description = "UI components for parental controls library";
     homepage = "https://gitlab.freedesktop.org/pwithnall/malcontent";