From a0463e87b3fb903e4d64010bbcad8e9a16dad787 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 3 Sep 2023 19:32:34 -0400 Subject: [PATCH] zon2nix: 0.1.1 -> 0.1.2 Diff: https://github.com/nix-community/zon2nix/compare/v0.1.1...v0.1.2 Changelog: https://github.com/nix-community/zon2nix/blob/v0.1.2/CHANGELOG.md --- pkgs/tools/nix/zon2nix/default.nix | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/nix/zon2nix/default.nix b/pkgs/tools/nix/zon2nix/default.nix index 967255d82aa5..78b7d601906c 100644 --- a/pkgs/tools/nix/zon2nix/default.nix +++ b/pkgs/tools/nix/zon2nix/default.nix @@ -1,36 +1,37 @@ { lib , stdenv , fetchFromGitHub -, makeBinaryWrapper , zig_0_11 , nix }: stdenv.mkDerivation rec { pname = "zon2nix"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { - owner = "figsoda"; + owner = "nix-community"; repo = "zon2nix"; rev = "v${version}"; - hash = "sha256-VzlLoToZ+5beHt9mFsuCxlSZ8RrBodPO6YKtsugAaik="; + hash = "sha256-pS0D+wdebtpNaGpDee9aBwEKTDvNU56VXer9uzULXcM="; }; nativeBuildInputs = [ - makeBinaryWrapper zig_0_11.hook ]; - postInstall = '' - wrapProgram $out/bin/zon2nix \ - --prefix PATH : ${lib.makeBinPath [ nix ]} - ''; + zigBuildFlags = [ + "-Dnix=${lib.getExe nix}" + ]; + + zigCheckFlags = [ + "-Dnix=${lib.getExe nix}" + ]; meta = with lib; { description = "Convert the dependencies in `build.zig.zon` to a Nix expression"; - homepage = "https://github.com/figsoda/zon2nix"; - changelog = "https://github.com/figsoda/zon2nix/blob/${src.rev}/CHANGELOG.md"; + homepage = "https://github.com/nix-community/zon2nix"; + changelog = "https://github.com/nix-community/zon2nix/blob/${src.rev}/CHANGELOG.md"; license = licenses.mpl20; maintainers = with maintainers; [ figsoda ]; inherit (zig_0_11.meta) platforms;