From 507902558c92350919981c1a33d1928dd11446bc Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 11 Dec 2023 22:40:52 +0100 Subject: [PATCH] zef: use `finalAttrs` pattern --- pkgs/development/interpreters/rakudo/zef.nix | 37 ++++++++++++++------ 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix index ba7343a9f3ba..2ce4a164f7e6 100644 --- a/pkgs/development/interpreters/rakudo/zef.nix +++ b/pkgs/development/interpreters/rakudo/zef.nix @@ -1,35 +1,50 @@ -{ lib, stdenv, fetchFromGitHub, rakudo, makeWrapper }: +{ lib +, stdenv +, fetchFromGitHub +, rakudo +, makeBinaryWrapper +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zef"; version = "0.21.1"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; - rev = "v${version}"; - sha256 = "sha256-ji+KTxAOPZhuGryK0+svsVkU+HC1egKZWOboSBUON+s="; + rev = "v${finalAttrs.version}"; + hash = "sha256-ji+KTxAOPZhuGryK0+svsVkU+HC1egKZWOboSBUON+s="; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ rakudo ]; + nativeBuildInputs = [ + makeBinaryWrapper + ]; + + buildInputs = [ + rakudo + ]; installPhase = '' + runHook preInstall + mkdir -p "$out" # TODO: Find better solution. zef stores cache stuff in $HOME with the # default config. env HOME=$TMPDIR ${rakudo}/bin/raku -I. ./bin/zef --/depends --/test-depends --/build-depends --install-to=$out install . + + runHook postInstall ''; postFixup ='' wrapProgram $out/bin/zef --prefix RAKUDOLIB , "inst#$out" ''; - meta = with lib; { + meta = { description = "Raku / Perl6 Module Management"; homepage = "https://github.com/ugexe/zef"; - license = licenses.artistic2; - platforms = platforms.unix; - maintainers = with maintainers; [ sgo ]; + license = lib.licenses.artistic2; + mainProgram = "zef"; + maintainers = with lib.maintainers; [ sgo ]; + platforms = lib.platforms.unix; }; -} +})