criu: fix merge fail
d020caa5b2eca90ea051403fbb4c52b99ee071b9 vs. e3d0fe898bb0451b2485ccc0be42354614f4fba3
This commit is contained in:
parent
b0d748e244
commit
f2a66d4c16
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
|||||||
ln -sf ${protobuf}/include/google/protobuf/descriptor.proto ./images/google/protobuf/descriptor.proto
|
ln -sf ${protobuf}/include/google/protobuf/descriptor.proto ./images/google/protobuf/descriptor.proto
|
||||||
'';
|
'';
|
||||||
|
|
||||||
configurePhase = "make config PREFIX=$out";
|
buildPhase = "make PREFIX=$out";
|
||||||
|
|
||||||
makeFlags = "PREFIX=$(out)";
|
makeFlags = "PREFIX=$(out)";
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user