summary refs log tree commit diff
path: root/pkgs/stdenv
diff options
context:
space:
mode:
authorJan Malakhovski <oxij@oxij.org>2018-01-02 14:52:27 +0000
committerJan Malakhovski <oxij@oxij.org>2018-01-14 13:24:22 +0000
commit9956687151f136172a0dfe2d97ee04132f4a90d8 (patch)
tree47f342436bec6fcb5138f25abc87b9b82d8c1ce5 /pkgs/stdenv
parentd1d5ecb3bf730984fcc7d8ef8ec322f1f67d0574 (diff)
downloadnixpkgs-9956687151f136172a0dfe2d97ee04132f4a90d8.tar
nixpkgs-9956687151f136172a0dfe2d97ee04132f4a90d8.tar.gz
nixpkgs-9956687151f136172a0dfe2d97ee04132f4a90d8.tar.bz2
nixpkgs-9956687151f136172a0dfe2d97ee04132f4a90d8.tar.lz
nixpkgs-9956687151f136172a0dfe2d97ee04132f4a90d8.tar.xz
nixpkgs-9956687151f136172a0dfe2d97ee04132f4a90d8.tar.zst
nixpkgs-9956687151f136172a0dfe2d97ee04132f4a90d8.zip
stdenv: change some indent
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r--pkgs/stdenv/generic/make-derivation.nix20
1 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 6038e2c339b..41b0cc1a437 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -194,24 +194,24 @@ rec {
       # but it's not part of the actual derivation, i.e., it's not
       # passed to the builder and is not a dependency.  But since we
       # include it in the result, it *is* available to nix-env for queries.
-      meta = { }
+      meta = {
           # If the packager hasn't specified `outputsToInstall`, choose a default,
           # which is the name of `p.bin or p.out or p`;
           # if he has specified it, it will be overridden below in `// meta`.
           #   Note: This default probably shouldn't be globally configurable.
           #   Services and users should specify outputs explicitly,
           #   unless they are comfortable with this default.
-        // { outputsToInstall =
-          let
-            outs = outputs'; # the value passed to derivation primitive
-            hasOutput = out: builtins.elem out outs;
-          in [( lib.findFirst hasOutput null (["bin" "out"] ++ outs) )];
+          outputsToInstall =
+            let
+              outs = outputs'; # the value passed to derivation primitive
+              hasOutput = out: builtins.elem out outs;
+            in [( lib.findFirst hasOutput null (["bin" "out"] ++ outs) )];
         }
         // attrs.meta or {}
-          # Fill `meta.position` to identify the source location of the package.
-        // lib.optionalAttrs (pos != null)
-          { position = pos.file + ":" + toString pos.line; }
-        ;
+        # Fill `meta.position` to identify the source location of the package.
+        // lib.optionalAttrs (pos != null) {
+          position = pos.file + ":" + toString pos.line;
+        };
 
     in