aboutsummaryrefslogtreecommitdiffhomepage
path: root/org
diff options
context:
space:
mode:
authorRalph Amissah <ralph.amissah@gmail.com>2022-11-11 17:52:55 -0500
committerRalph Amissah <ralph.amissah@gmail.com>2022-11-11 17:52:55 -0500
commitea80c5100a43f714fc5bd5139b6839a34133c368 (patch)
treed74aa8f0f9b7aaa88c1b44c5f2ba6e7c0297c47c /org
parentorg nix (diff)
org nix cosmetic
Diffstat (limited to 'org')
-rw-r--r--org/config_nix.org27
1 files changed, 7 insertions, 20 deletions
diff --git a/org/config_nix.org b/org/config_nix.org
index 92576e0..4a637a4 100644
--- a/org/config_nix.org
+++ b/org/config_nix.org
@@ -561,12 +561,8 @@ postInstall:
echo "built:"
$out/bin/spine -v
'';
- nativeBuildInputs = with pkgs; [
- ldc dub
- ];
- buildInputs = with pkgs; [
- sqlite
- ];
+ nativeBuildInputs = with pkgs; [ ldc dub ];
+ buildInputs = with pkgs; [ sqlite ];
};
packages.x86_64-linux.default = self.packages.x86_64-linux.spine;
};
@@ -1024,8 +1020,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}";
@@ -1088,8 +1083,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
}));
}
);
@@ -1097,14 +1091,8 @@ mkDubDerivation rec {
pname = "spine";
version = "<<spine_version_set>>";
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 = ''
@@ -1564,8 +1552,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
}));
}
);