summary refs log tree commit diff
path: root/pkgs/applications/virtualization/crun/default.nix
diff options
context:
space:
mode:
authoradisbladis <adisbladis@gmail.com>2022-06-21 23:43:34 +0800
committeradisbladis <adisbladis@gmail.com>2022-06-22 20:48:56 +0800
commite53c4b9205b91525afd42507c39319342561c435 (patch)
tree2e73c198139723c37aeb84c85761f9a6deaf5ca7 /pkgs/applications/virtualization/crun/default.nix
parent4af6cb96b274b2f850a1b1e4d0dd303d42708480 (diff)
downloadnixpkgs-e53c4b9205b91525afd42507c39319342561c435.tar
nixpkgs-e53c4b9205b91525afd42507c39319342561c435.tar.gz
nixpkgs-e53c4b9205b91525afd42507c39319342561c435.tar.bz2
nixpkgs-e53c4b9205b91525afd42507c39319342561c435.tar.lz
nixpkgs-e53c4b9205b91525afd42507c39319342561c435.tar.xz
nixpkgs-e53c4b9205b91525afd42507c39319342561c435.tar.zst
nixpkgs-e53c4b9205b91525afd42507c39319342561c435.zip
crun: Don't use hard-coded /usr/bin paths
The paths to newuidmap & newgidmap are currently hard-coded in the binary.
Diffstat (limited to 'pkgs/applications/virtualization/crun/default.nix')
-rw-r--r--pkgs/applications/virtualization/crun/default.nix10
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix
index 2d35b1c4a03..1a49d768886 100644
--- a/pkgs/applications/virtualization/crun/default.nix
+++ b/pkgs/applications/virtualization/crun/default.nix
@@ -11,6 +11,7 @@
 , yajl
 , nixosTests
 , criu
+, fetchpatch
 }:
 
 let
@@ -48,6 +49,15 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
+  patches = [
+    # Should dropped in next release after 1.4.5
+    (fetchpatch {
+      name = "usrbin-paths.patch";
+      url = "https://github.com/containers/crun/commit/dd29f7f7f713c49784ac30f7cdca33b2ef94d5b8.patch";
+      sha256 = "sha256-kHHix8CUL+c8HbOe5qx4PeF1P19113U4bRZyleMUjqk=";
+    })
+  ];
+
   nativeBuildInputs = [ autoreconfHook go-md2man pkg-config python3 ];
 
   buildInputs = [ libcap libseccomp systemd yajl ]