From bf0a539da4e80aa2531bdaca14bace5bb4ed665f Mon Sep 17 00:00:00 2001 From: Sandro Date: Fri, 14 Oct 2022 14:02:07 +0200 Subject: [PATCH] myrddin: cleanup, add -j$NIX_BUILD_CORES to make remove unused input, fix formatting, add -j$NIX_BUILD_CORES to make --- pkgs/development/compilers/myrddin/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/myrddin/default.nix b/pkgs/development/compilers/myrddin/default.nix index 9ac2ed36be23..b682b1e0ac54 100644 --- a/pkgs/development/compilers/myrddin/default.nix +++ b/pkgs/development/compilers/myrddin/default.nix @@ -4,7 +4,6 @@ , pkg-config , bison , binutils -, binutils-unwrapped , makeWrapper }: @@ -27,17 +26,17 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace mk/c.mk \ - --replace "-Werror" "" + --replace "-Werror" "" ''; buildPhase = '' - make bootstrap - make + make bootstrap -j$NIX_BUILD_CORES + make -j$NIX_BUILD_CORES ''; postInstall = '' for b in $out/bin/*; do - wrapProgram $b --prefix PATH : $out/bin:${lib.makeBinPath [ binutils ]} + wrapProgram $b --prefix PATH : $out/bin:${lib.makeBinPath [ binutils ]} done ''; @@ -48,12 +47,12 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { - # darwin: never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/myrddin.x86_64-darwin - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; description = "Systems language that is both powerful and fun to use"; homepage = "https://myrlang.org/"; license = licenses.mit; maintainers = with maintainers; [ luc65r ]; platforms = platforms.all; + # darwin: never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/myrddin.x86_64-darwin + broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; }; }