Unverified Commit a21d6dcd authored by Peter Hoeg's avatar Peter Hoeg Committed by GitHub
Browse files

buildCrystalPackage: fix env overrides (#504643)

parents 7c7f88ed 05f00b2f

pkgs/development/compilers/crystal/build-package.nix

+7 −5
Original line number Diff line number Diff line
@@ -108,11 +108,12 @@ stdenv.mkDerivation ( 
        ++ [ "runHook postConfigure" ]

      ));



    env = args.env or { } // {

    env = {

      CRFLAGS = lib.concatStringsSep " " defaultOptions;



      PREFIX = placeholder "out";

    };

    }

    // (args.env or { });



    inherit enableParallelBuilding;

    strictDeps = true;
@@ -205,8 +206,9 @@ stdenv.mkDerivation ( 
        done

      '';



    meta = args.meta or { } // {

      platforms = args.meta.platforms or crystal.meta.platforms;

    };

    meta = {

      platforms = crystal.meta.platforms;

    }

    // (args.meta or { });

  }

)