diff options
| author | Petr Rockai <prockai@redhat.com> | 2015-02-05 13:30:02 +0100 |
|---|---|---|
| committer | Petr Rockai <prockai@redhat.com> | 2015-02-05 13:51:38 +0100 |
| commit | 81b34dce6173cb8599aebb5e052d8df573d3aecb (patch) | |
| tree | 5638eea2cc251df131db391032b0f5f41a027afd /nix | |
| parent | 5cd6cce5a41cd5583470c45bad2dad4b08f04ad2 (diff) | |
| download | lvm2-81b34dce6173cb8599aebb5e052d8df573d3aecb.tar.gz | |
NIX: We need to install lcov for ./configure now as well.
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/default.nix | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/nix/default.nix b/nix/default.nix index b72379e73..6bb94dbb7 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -11,6 +11,11 @@ let pkgs = import nixpkgs {}; lib = pkgs.lib; over = overrides { inherit pkgs; }; + install_lcov = '' + rpm -Uv ${pkgs.fetchurl { + url = "http://archives.fedoraproject.org/pub/archive/fedora/linux/updates/16/i386/lcov-1.9-2.fc16.noarch.rpm"; + sha256 = "0ycdh5mb7p5ll76mqk0p6gpnjskvxxgh3a3bfr1crh94nvpwhp4z"; }} + ''; mkTest = args: pkgs.stdenv.mkDerivation rec { name = "lvm2-test-${(args.diskFun {}).name}"; @@ -42,9 +47,7 @@ let # we always run in a fresh image, so need to install everything again ls ${build}/rpms/*/*.rpm | grep -v sysvinit | xargs rpm -Uv --oldpackage # */ - rpm -Uv ${pkgs.fetchurl { - url = "http://archives.fedoraproject.org/pub/archive/fedora/linux/updates/16/i386/lcov-1.9-2.fc16.noarch.rpm"; - sha256 = "0ycdh5mb7p5ll76mqk0p6gpnjskvxxgh3a3bfr1crh94nvpwhp4z"; }} + ${install_lcov} mkdir -p /xchg/results touch /xchg/booted @@ -168,6 +171,8 @@ let memSize = 512; checkPhase = ":"; + preConfigure = install_lcov; + postInstall = '' mkdir -p $out/nix-support for i in $out/rpms/*/*.rpm; do # */ |