From dcfdb79b0984169e60142e52616b4cc3fe9908fc Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Sat, 9 Oct 2021 14:37:58 +0200
Subject: [PATCH 1/3] lib.{literalExpression, literalDocBook}: init as shims

Compatibility shims for https://github.com/NixOS/nixpkgs/pull/136909
---
 lib/default.nix | 4 ++--
 lib/options.nix | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/default.nix b/lib/default.nix
index ccae0bbc3ab4..1a4c2c6d556b 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -123,8 +123,8 @@ let
     inherit (self.options) isOption mkEnableOption mkSinkUndeclaredOptions
       mergeDefaultOption mergeOneOption mergeEqualOption getValues
       getFiles optionAttrSetToDocList optionAttrSetToDocList'
-      scrubOptionValue literalExample showOption showFiles
-      unknownModule mkOption;
+      scrubOptionValue literalExpression literalExample literalDocBook
+      showOption showFiles unknownModule mkOption;
     inherit (self.types) isType setType defaultTypeMerge defaultFunctor
       isOptionType mkOptionType;
     inherit (self.asserts)
diff --git a/lib/options.nix b/lib/options.nix
index 87cd8b797969..e8a020c8bf42 100644
--- a/lib/options.nix
+++ b/lib/options.nix
@@ -217,6 +217,10 @@ rec {
   */
   literalExample = text: { _type = "literalExample"; inherit text; };
 
+  # Compatibility shims for https://github.com/NixOS/nixpkgs/pull/136909
+  literalExpression = literalExample;
+  literalDocBook = literalExample;
+
   # Helper functions.
 
   /* Convert an option, described as a list of the option parts in to a

From f134749c7e2d25042f1cfe8fc8700c8c7a6093f6 Mon Sep 17 00:00:00 2001
From: Andrea Scarpino <andrea@scarpino.dev>
Date: Tue, 12 Oct 2021 17:21:29 +0200
Subject: [PATCH 2/3] yubikey-manager: patch path of pkill binary (#138941)

(cherry picked from commit 36304fc89dffe99fc1e05e2b9865fbf562d43650)

Co-authored-by: Yureka <yuka@yuka.dev>
---
 pkgs/tools/misc/yubikey-manager/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix
index 12b3aa0f05f6..c50100eeb84c 100644
--- a/pkgs/tools/misc/yubikey-manager/default.nix
+++ b/pkgs/tools/misc/yubikey-manager/default.nix
@@ -1,5 +1,5 @@
 { python3Packages, fetchurl, lib,
-  yubikey-personalization, libu2f-host, libusb1 }:
+  yubikey-personalization, libu2f-host, libusb1, procps }:
 
 python3Packages.buildPythonPackage rec {
   pname = "yubikey-manager";
@@ -10,6 +10,11 @@ python3Packages.buildPythonPackage rec {
     hash = "sha256-OxbKo5vwOBabU6/2hO4RMWiifo4IVIxz+DlcwP9xO/E=";
   };
 
+  postPatch = ''
+    substituteInPlace "ykman/pcsc/__init__.py" \
+      --replace '/usr/bin/pkill' '${procps}/bin/pkill'
+  '';
+
   propagatedBuildInputs =
     with python3Packages; [
       click

From 4e14b762865b4bdc717ce14eec3b31b42377e4d2 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Tue, 12 Oct 2021 11:21:55 -0500
Subject: [PATCH 3/3] nanopb: Use protoc from buildPackages

This fixes cross compilation.

(cherry picked from commit d8b35aa96bd0947f9a924fdde09bd43e3fa91053)
---
 pkgs/development/libraries/nanopb/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/nanopb/default.nix b/pkgs/development/libraries/nanopb/default.nix
index ca078a3f9d2a..c70298c4ff82 100644
--- a/pkgs/development/libraries/nanopb/default.nix
+++ b/pkgs/development/libraries/nanopb/default.nix
@@ -5,6 +5,7 @@
 , protobuf
 , python3
 , stdenv
+, buildPackages
 }:
 
 stdenv.mkDerivation rec {
@@ -25,7 +26,7 @@ stdenv.mkDerivation rec {
   cmakeFlags = [
     "-DBUILD_SHARED_LIBS=ON" # generate $out/lib/libprotobuf-nanopb.so{.0,}
     "-DBUILD_STATIC_LIBS=ON" # generate $out/lib/libprotobuf-nanopb.a
-    "-Dnanopb_PROTOC_PATH=${protobuf}/bin/protoc"
+    "-Dnanopb_PROTOC_PATH=${buildPackages.protobuf}/bin/protoc"
   ];
 
   postInstall = ''