From 17d17217d81c66d9e3fe5cd72155088c99f35155 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 9 Dec 2022 14:27:30 +0100 Subject: use stdenvNoCC instead of barebone derivation --- package.nix | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/package.nix b/package.nix index a8fc8be..6e63310 100644 --- a/package.nix +++ b/package.nix @@ -1,4 +1,4 @@ -{ coreutils, gnused, lib }: +{ stdenvNoCC, lib }: let inclFiles = {src, name}: files: lib.cleanSourceWith { @@ -6,13 +6,16 @@ let filter = _path: _type: _type == "regular" && lib.any (file: builtins.baseNameOf _path == file) files; }; in -derivation rec { - system = "x86_64-linux"; +stdenvNoCC.mkDerivation rec { name = "disko"; - builder = "/bin/sh"; - PATH = "${coreutils}/bin:${gnused}/bin"; - passAsFile = ["buildPhase"]; - buildPhase = '' + src = inclFiles { inherit name; src = ./.; } [ + "disko" + "cli.nix" + "default.nix" + "types.nix" + "options.nix" + ]; + installPhase = '' mkdir -p $out/bin $out/share/disko cp -r $src/* $out/share/disko sed \ @@ -21,14 +24,11 @@ derivation rec { $src/disko > $out/bin/disko chmod 755 $out/bin/disko ''; - args = ["-c" ". $buildPhasePath"]; - src = inclFiles { inherit name; src = ./.; } [ - "disko" - "cli.nix" - "default.nix" - "types.nix" - "options.nix" - ]; -} // { - meta.description = "Format disks with nix-config"; + meta = with lib; { + description = "Format disks with nix-config"; + homepage = "https://github.com/nix-community/disko"; + license = licenses.mit; + maintainers = with maintainers; [ lassulus ]; + platforms = platforms.linux; + }; } -- cgit v1.2.3