From ea80c5100a43f714fc5bd5139b6839a34133c368 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Fri, 11 Nov 2022 17:52:55 -0500 Subject: org nix cosmetic --- derivation.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'derivation.nix') diff --git a/derivation.nix b/derivation.nix index 3988e7c..04a3305 100644 --- a/derivation.nix +++ b/derivation.nix @@ -9,8 +9,7 @@ assert dcompiler != null; with ( with lib; let - # filter function to remove the .dub package folder from src - filterDub = name: type: let baseName = baseNameOf (toString name); in ! ( + filterDub = name: type: let baseName = baseNameOf (toString name); in ! ( # filter function to remove the .dub package folder from src type == "directory" && baseName == ".dub" ); targetOf = package: "${package.targetPath or "."}/${package.targetName or package.name}"; @@ -73,8 +72,7 @@ with ( description = package.description; } // attrs.meta or {}; } // lib.optionalAttrs (!(attrs ? version)) { - # use name from dub.json, unless pname and version are specified - name = package.name; + name = package.name; # use name from dub.json, unless pname and version are specified })); } ); @@ -82,14 +80,8 @@ mkDubDerivation rec { pname = "spine"; version = "0.11.3"; src = ./.; - nativeBuildInputs = with pkgs; [ - dub - ldc - ]; - buildInputs = with pkgs; [ - nixVersions.unstable #nixFlakes - sqlite - ]; + nativeBuildInputs = with pkgs; [ dub ldc ]; + buildInputs = with pkgs; [ nixVersions.unstable sqlite ]; meta = with pkgs.lib; { description = "A sisu like parser and document generator"; longDescription = '' -- cgit v1.2.3