diff options
| author | Domen Kožar <domen@dev.si> | 2013-05-27 14:39:50 -0700 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2013-05-27 14:39:50 -0700 |
| commit | 80bd0dda5341c84b84326593ccf40f66bc72042d (patch) | |
| tree | 92903eba59bd7f8b3e9b638254f33402ff7e5430 | |
| parent | bb66651d681a513230d12677c54626684dba3bf8 (diff) | |
| parent | 29b6370b0c4678ea8ae8413001d9a2911594886e (diff) | |
| download | nixlib-80bd0dda5341c84b84326593ccf40f66bc72042d.tar nixlib-80bd0dda5341c84b84326593ccf40f66bc72042d.tar.gz nixlib-80bd0dda5341c84b84326593ccf40f66bc72042d.tar.bz2 nixlib-80bd0dda5341c84b84326593ccf40f66bc72042d.tar.lz nixlib-80bd0dda5341c84b84326593ccf40f66bc72042d.tar.xz nixlib-80bd0dda5341c84b84326593ccf40f66bc72042d.tar.zst nixlib-80bd0dda5341c84b84326593ccf40f66bc72042d.zip | |
Merge pull request #569 from errge/vboot_reference
Fix vboot_reference's libuuid overriding to work on systems wo libuuid
| -rw-r--r-- | pkgs/tools/system/vboot_reference/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix index 257a4ec4fd0b..4c3c58b35cdd 100644 --- a/pkgs/tools/system/vboot_reference/default.nix +++ b/pkgs/tools/system/vboot_reference/default.nix @@ -16,9 +16,11 @@ in stdenv.mkDerivation { sha256 = "00qhwhh5ygrcfm9is8hrk1spqdvfs6aa744h10jbr03zics5bvac"; }; - buildInputs = [ pkgconfig openssl - (stdenv.lib.overrideDerivation libuuid - (args: { configureFlags = args.configureFlags + " --enable-static"; })) ]; + buildInputs = [ pkgconfig openssl ] ++ + (if libuuid == null + then [] + else [ (stdenv.lib.overrideDerivation libuuid + (args: { configureFlags = args.configureFlags + " --enable-static"; })) ]); buildPhase = '' make ARCH=${arch} `pwd`/build/cgpt/cgpt |