about summary refs log tree commit diff
path: root/corepkgs/buildenv.pl
diff options
context:
space:
mode:
authorIvan Kozik <ivan@ludios.org>2013-08-10T21·36+0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2013-08-26T09·15+0200
commit34bb806f747d5edc16119e38e2ac44e6b236ac12 (patch)
treebee9d463cd53277998bc20b7b37e78745461ce25 /corepkgs/buildenv.pl
parentc6c024ca6f587dab991589ad6fdf010b9f0e6d62 (diff)
Fix typos, especially those that end up in the Nix manual
Diffstat (limited to 'corepkgs/buildenv.pl')
-rw-r--r--corepkgs/buildenv.pl4
1 files changed, 2 insertions, 2 deletions
diff --git a/corepkgs/buildenv.pl b/corepkgs/buildenv.pl
index 1ab19d26f23c..f98cca7c8582 100644
--- a/corepkgs/buildenv.pl
+++ b/corepkgs/buildenv.pl
@@ -53,7 +53,7 @@ sub createLinks {
             elsif (-l _) {
                 my $target = readlink $dstFile or die;
                 if (!-d $target) {
-                    die "collission between directory `$srcFile' and non-directory `$target'";
+                    die "collision between directory `$srcFile' and non-directory `$target'";
                 }
                 unlink $dstFile or die "error unlinking `$dstFile': $!";
                 mkdir $dstFile, 0755 ||
@@ -75,7 +75,7 @@ sub createLinks {
             if (-l $dstFile) {
                 my $target = readlink $dstFile;
                 my $prevPriority = $priorities{$dstFile};
-                die ( "collission between `$srcFile' and `$target'; "
+                die ( "collision between `$srcFile' and `$target'; "
                     . "use `nix-env --set-flag "
                     . "priority NUMBER PKGNAME' to change the priority of "
                     . "one of the conflicting packages\n" )