diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-08-26 00:57:08 -0400 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-08-26 00:57:08 -0400 |
| commit | 262fd63a721dfc2733c55b8db8b8d0881fc5c7c1 (patch) | |
| tree | 1729d972da28f35d4614411e151dc3c505451b8c /pkgs/build-support | |
| parent | b8e97a29cbf75dc0f0fac664a74489ad1fd7f61f (diff) | |
| parent | e3cdd952fdcbf2ff6181fd32d69d32a2ccb1daef (diff) | |
Merge branch 'master' into staging-next
Conflicts: pkgs/tools/networking/inetutils/default.nix
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/vm/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/build-support/vm/test.nix | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index cfc19c03cfdd3..3a52d756571c8 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -494,7 +494,9 @@ rec { tarball must contain an RPM specfile. */ buildRPM = attrs: runInLinuxImage (stdenv.mkDerivation ({ - phases = "prepareImagePhase sysInfoPhase buildPhase installPhase"; + prePhases = [ prepareImagePhase sysInfoPhase ]; + dontUnpack = true; + dontConfigure = true; outDir = "rpms/${attrs.diskImage.name}"; diff --git a/pkgs/build-support/vm/test.nix b/pkgs/build-support/vm/test.nix index 6985030326719..1a29554ee80cc 100644 --- a/pkgs/build-support/vm/test.nix +++ b/pkgs/build-support/vm/test.nix @@ -1,4 +1,4 @@ -with import ../../.. {}; +with import ../../.. { }; with vmTools; { @@ -30,7 +30,7 @@ with vmTools; src = patchelf.src; diskImage = diskImages.ubuntu1204i386; memSize = 512; - phases = "sysInfoPhase unpackPhase patchPhase configurePhase buildPhase checkPhase installPhase fixupPhase distPhase"; + prePhases = [ sysInfoPhase ]; sysInfoPhase = '' dpkg-query --list ''; |