Unverified Commit fae0b890 authored by Artturi's avatar Artturi Committed by GitHub
Browse files

Merge pull request #181497 from Mindavi/cross/eval-fixes

parents dc98fc6b 77449a07

pkgs/applications/virtualization/appvm/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ buildGoModule rec { 


  vendorSha256 = "sha256-8eU+Mf5dxL/bAMMShXvj8I1Kdd4ysBTWvgYIXwLStPI=";



  buildInputs = [ makeWrapper ];

  nativeBuildInputs = [ makeWrapper ];



  postFixup = ''

    wrapProgram $out/bin/appvm \

pkgs/applications/virtualization/arion/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
, haskellPackages

, haskell

, runCommand

, buildPackages

}:



let
@@ -32,7 +33,7 @@ let 
  inherit (haskellPackages) arion-compose;



  cabalOverrides = o: {

    buildTools = (o.buildTools or []) ++ [pkgs.makeWrapper];

    buildTools = (o.buildTools or []) ++ [buildPackages.makeWrapper];

    passthru = (o.passthru or {}) // {

      inherit eval build;

    };

pkgs/development/compilers/chicken/4/chicken.nix

+5 −3
Original line number Diff line number Diff line
@@ -39,11 +39,13 @@ stdenv.mkDerivation { 
    ./0001-Introduce-CHICKEN_REPOSITORY_EXTRA.patch

  ];



  buildInputs = [

  nativeBuildInputs = [

    makeWrapper

  ] ++ (lib.optionals (bootstrap-chicken != null) [

  ];



  buildInputs = lib.optionals (bootstrap-chicken != null) [

    bootstrap-chicken

  ]);

  ];



  preBuild = lib.optionalString (bootstrap-chicken != null) ''

    # Backup the build* files - those are generated from hostname,

pkgs/development/compilers/chicken/5/chicken.nix

+5 −3
Original line number Diff line number Diff line
@@ -31,11 +31,13 @@ stdenv.mkDerivation rec { 
    "C_COMPILER=$(CC)"

  ]);



  buildInputs = [

  nativeBuildInputs = [

    makeWrapper

  ] ++ (lib.optionals (bootstrap-chicken != null) [

  ];



  buildInputs = lib.optionals (bootstrap-chicken != null) [

    bootstrap-chicken

  ]);

  ];



  postInstall = ''

    for f in $out/bin/*

pkgs/development/interpreters/acl2/default.nix

+4 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ let 
  # ACL2 system itself; see

  # https://www.cs.utexas.edu/users/moore/acl2/current/HTML/installation/requirements.html#Obtaining-SBCL

  sbcl' = args.sbcl.override { disableImmobileSpace = true; };

  sbcl = runCommandLocal args.sbcl.name { buildInputs = [ makeWrapper ]; } ''

  sbcl = runCommandLocal args.sbcl.name { nativeBuildInputs = [ makeWrapper ]; } ''

    makeWrapper ${sbcl'}/bin/sbcl $out/bin/sbcl \

      --add-flags "--dynamic-space-size 2000"

  '';
@@ -40,12 +40,14 @@ in stdenv.mkDerivation rec { 
    libcrypto = "${lib.getLib openssl}/lib/libcrypto${stdenv.hostPlatform.extensions.sharedLibrary}";

  })];



  nativeBuildInputs = lib.optional certifyBooks makeWrapper;



  buildInputs = [

    # ACL2 itself only needs a Common Lisp compiler/interpreter:

    sbcl

  ] ++ lib.optionals certifyBooks [

    # To build community books, we need Perl and a couple of utilities:

    which perl hostname makeWrapper

    which perl hostname

    # Some of the books require one or more of these external tools:

    glucose minisat abc-verifier libipasir

    z3 (python2.withPackages (ps: [ ps.z3 ]))