diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-21 15:36:02 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-21 15:36:02 +0200 |
| commit | 765d695b89fac76f84b1ff9a1a7737753b2d8530 (patch) | |
| tree | c130c7dc4d7d05e0bcea14be12b7a9dcef2cc642 /pkgs/tools/filesystems/nixpart/0.4/parted.nix | |
| parent | 690a8017de9f9e9bed8609c1798d6d4309d9794a (diff) | |
| parent | cad8fc3447372043c4a098a3104a03f4990058e4 (diff) | |
| download | nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.gz nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.bz2 nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.lz nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.xz nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.tar.zst nixlib-765d695b89fac76f84b1ff9a1a7737753b2d8530.zip | |
Merge branch 'staging-next'
Security fixes for a few packages are included.
Diffstat (limited to 'pkgs/tools/filesystems/nixpart/0.4/parted.nix')
| -rw-r--r-- | pkgs/tools/filesystems/nixpart/0.4/parted.nix | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/pkgs/tools/filesystems/nixpart/0.4/parted.nix b/pkgs/tools/filesystems/nixpart/0.4/parted.nix index 3f43fdc0c395..f356727e64bb 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/parted.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/parted.nix @@ -13,8 +13,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (readline != null) readline ++ stdenv.lib.optional (gettext != null) gettext ++ stdenv.lib.optional (lvm2 != null) lvm2 - ++ stdenv.lib.optional (hurd != null) hurd - ++ stdenv.lib.optional doCheck check; + ++ stdenv.lib.optional (hurd != null) hurd; configureFlags = (if (readline != null) @@ -24,11 +23,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional enableStatic "--enable-static"; doCheck = true; - - preCheck = - stdenv.lib.optionalString doCheck - # The `t0400-loop-clobber-infloop.sh' test wants `mkswap'. - "export PATH=\"${utillinux}/sbin:$PATH\""; + checkInputs = [ check utillinux ]; meta = { description = "Create, destroy, resize, check, and copy partitions"; |