mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 12:29:02 +02:00
crun: Don't use hard-coded /usr/bin paths
The paths to newuidmap & newgidmap are currently hard-coded in the binary.
This commit is contained in:
parent
4af6cb96b2
commit
e53c4b9205
|
@ -11,6 +11,7 @@
|
||||||
, yajl
|
, yajl
|
||||||
, nixosTests
|
, nixosTests
|
||||||
, criu
|
, criu
|
||||||
|
, fetchpatch
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
@ -48,6 +49,15 @@ stdenv.mkDerivation rec {
|
||||||
fetchSubmodules = true;
|
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 ];
|
nativeBuildInputs = [ autoreconfHook go-md2man pkg-config python3 ];
|
||||||
|
|
||||||
buildInputs = [ libcap libseccomp systemd yajl ]
|
buildInputs = [ libcap libseccomp systemd yajl ]
|
||||||
|
|
Loading…
Reference in a new issue