summary refs log tree commit diff
path: root/doc
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2018-05-11 17:12:04 -0400
committerJohn Ericson <John.Ericson@Obsidian.Systems>2018-05-11 17:12:04 -0400
commit81387c2e783a783368162af085984811727be538 (patch)
tree38c1b854f0dd2d37d8bdd828789895b2e8f1445f /doc
parentee4b56edd364922c6a20a8d7b21a5a72497b4bc2 (diff)
parent0a77a728954460725a7346d6f180283048ed77c2 (diff)
downloadnixpkgs-81387c2e783a783368162af085984811727be538.tar
nixpkgs-81387c2e783a783368162af085984811727be538.tar.gz
nixpkgs-81387c2e783a783368162af085984811727be538.tar.bz2
nixpkgs-81387c2e783a783368162af085984811727be538.tar.lz
nixpkgs-81387c2e783a783368162af085984811727be538.tar.xz
nixpkgs-81387c2e783a783368162af085984811727be538.tar.zst
nixpkgs-81387c2e783a783368162af085984811727be538.zip
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'doc')
-rw-r--r--doc/configuration.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/configuration.xml b/doc/configuration.xml
index 4411b4844e9..c91f38f3093 100644
--- a/doc/configuration.xml
+++ b/doc/configuration.xml
@@ -378,7 +378,7 @@
     myPackages = pkgs.buildEnv {
       name = "my-packages";
       paths = [ aspell bc coreutils ffmpeg nixUnstable emscripten jq nox silver-searcher ];
-      pathsToLink = [ "/share/man" "/share/doc" /bin" ];
+      pathsToLink = [ "/share/man" "/share/doc" "/bin" ];
       extraOutputsToInstall = [ "man" "doc" ];
     };
   };
@@ -416,7 +416,7 @@ cp ${myProfile} $out/etc/profile.d/my-profile.sh
         nox
         silver-searcher
       ];
-      pathsToLink = [ "/share/man" "/share/doc" /bin" "/etc" ];
+      pathsToLink = [ "/share/man" "/share/doc" "/bin" "/etc" ];
       extraOutputsToInstall = [ "man" "doc" ];
     };
   };