wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-16 02:01:59 +02:00
Code Activity

Fix typos, especially those that end up in the Nix manual

Browse source
This commit is contained in:
Ivan Kozik 2013-08-10 21:36:16 +00:00 • committed by Eelco Dolstra
parent c6c024ca6f
commit 34bb806f74
18 changed files with 34 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

4
corepkgs/buildenv.pl
View file

@ -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" )