Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 64c2ffbe7551
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b22fa4e0911a
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 7, 2019

  1. lkl: fix cross

    @lopsided98
    lopsided98 committed Jun 7, 2019
    Copy the full SHA
    95c412a View commit details

Commits on Jun 9, 2019

  1. Merge pull request #62842 from lopsided98/lkl-cross 

    lkl: fix cross
    @matthewbauer
    matthewbauer authored Jun 9, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b22fa4e View commit details
Showing with 8 additions and 2 deletions.
  1. +8 −2 pkgs/applications/virtualization/lkl/default.nix
10 changes: 8 additions & 2 deletions pkgs/applications/virtualization/lkl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{ stdenv, fetchFromGitHub, bc, python, bison, flex, fuse, libarchive }:
{ stdenv, fetchFromGitHub, bc, python, bison, flex, fuse, libarchive
, buildPackages }:

stdenv.mkDerivation rec {
name = "lkl-2018-08-22";
@@ -40,7 +41,12 @@ stdenv.mkDerivation rec {
# crypto/jitterentropy.c:54:3: error: #error "The CPU Jitter random number generator must not be compiled with optimizations. See documentation. Use the compiler switch -O0 for compiling jitterentropy.c."
hardeningDisable = [ "format" "fortify" ];

makeFlags = "-C tools/lkl";
makeFlags = [
"-C tools/lkl"
"CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"
"HOSTCC=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc"
"CROSS_COMPILE=${stdenv.cc.targetPrefix}"
];

enableParallelBuilding = true;