diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-08-02 17:52:51 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-08-02 17:52:51 +0200 |
| commit | f2a66d4c16d19e671dc0a39956c08de2852e42a3 (patch) | |
| tree | 6c5e1ead745e5276ddd62a584df6ed27e23a30f9 /pkgs/os-specific/linux/criu | |
| parent | b0d748e244df6c977b2a1db3873ffdc271e59615 (diff) | |
| download | nixlib-f2a66d4c16d19e671dc0a39956c08de2852e42a3.tar nixlib-f2a66d4c16d19e671dc0a39956c08de2852e42a3.tar.gz nixlib-f2a66d4c16d19e671dc0a39956c08de2852e42a3.tar.bz2 nixlib-f2a66d4c16d19e671dc0a39956c08de2852e42a3.tar.lz nixlib-f2a66d4c16d19e671dc0a39956c08de2852e42a3.tar.xz nixlib-f2a66d4c16d19e671dc0a39956c08de2852e42a3.tar.zst nixlib-f2a66d4c16d19e671dc0a39956c08de2852e42a3.zip | |
criu: fix merge fail
d020caa5b2eca90ea051403fbb4c52b99ee071b9 vs. e3d0fe898bb0451b2485ccc0be42354614f4fba3
Diffstat (limited to 'pkgs/os-specific/linux/criu')
| -rw-r--r-- | pkgs/os-specific/linux/criu/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index fb25ef27378a..efca4c7bbb5b 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { 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)"; |