From 50adcfe3038ce749771832c3ab78e6d97451139c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 2 Feb 2023 13:51:49 +0100 Subject: [PATCH] disko: fix packaging missing nix files --- package.nix | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/package.nix b/package.nix index 6e63310..2a70eab 100644 --- a/package.nix +++ b/package.nix @@ -1,27 +1,15 @@ { stdenvNoCC, lib }: -let - inclFiles = {src, name}: files: lib.cleanSourceWith { - inherit src name; - filter = _path: _type: _type == "regular" && lib.any (file: builtins.baseNameOf _path == file) files; - }; -in stdenvNoCC.mkDerivation rec { name = "disko"; - src = inclFiles { inherit name; src = ./.; } [ - "disko" - "cli.nix" - "default.nix" - "types.nix" - "options.nix" - ]; + src = ./.; installPhase = '' mkdir -p $out/bin $out/share/disko - cp -r $src/* $out/share/disko + cp -r cli.nix default.nix types.nix disk-deactivate types $out/share/disko sed \ -e "s|libexec_dir=\".*\"|libexec_dir=\"$out/share/disko\"|" \ -e "s|#!/usr/bin/env.*|#!/usr/bin/env bash|" \ - $src/disko > $out/bin/disko + disko > $out/bin/disko chmod 755 $out/bin/disko ''; meta = with lib; {