Commit 3bef6e06 authored by Philipp Jungkamp's avatar Philipp Jungkamp
Browse files

kakoune: fix statically-linked and cross-compiled build 

The kakoune Makefile does not use the c++ compiler specified by the
`CXX` environment variable and instead defaults to `c++` as the
executable name.

Override the Makefile `CXX` variable with the value from the stdenv
environment.
parent fc35b306

pkgs/applications/editors/kakoune/default.nix

+4 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ stdenv.mkDerivation (finalAttrs: { 
    rev = "v${finalAttrs.version}";

    hash = "sha256-AJvh6NVFpbPsyzfeii/5muE+i4TwfxhwhDVgMLYOJCM=";

  };



  makeFlags = [

    "debug=no"

    "PREFIX=${placeholder "out"}"
@@ -23,6 +24,9 @@ stdenv.mkDerivation (finalAttrs: { 
  '';



  enableParallelBuilding = true;

  preBuild = ''

    appendToVar makeFlags "CXX=$CXX"

  '';



  doInstallCheck = true;

  installCheckPhase = ''