summary refs log tree commit diff
path: root/src/libstore/build.cc
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2006-12-12 23:05:01 +0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2006-12-12 23:05:01 +0000
commita3e6415ba8cf1b8d2a1db40c06997d997eac8afc (patch)
tree16e43edf9a785101b562ee3bfa6cbaeb600fc22a /src/libstore/build.cc
parentb438d37558eab56a2927771013c9080675381ba8 (diff)
downloadguix-a3e6415ba8cf1b8d2a1db40c06997d997eac8afc.tar.gz
* New primop builtins.filterSource, which can be used to filter files
  from a source directory.  All files for which a predicate function
  returns true are copied to the store.  Typical example is to leave
  out the .svn directory:

    stdenv.mkDerivation {
      ...
      src = builtins.filterSource
        (path: baseNameOf (toString path) != ".svn")
        ./source-dir;
      # as opposed to
      #   src = ./source-dir;
    }

  This is important because the .svn directory influences the hash in
  a rather unpredictable and variable way.

Diffstat (limited to 'src/libstore/build.cc')
-rw-r--r--src/libstore/build.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 14388a7b56..9bcf336a4f 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -949,7 +949,7 @@ void DerivationGoal::buildDone()
                as that means that someone else can have interfered
                with the build.  Also, the output should be owned by
                the build user. */
-            if ((st.st_mode & (S_IWGRP | S_IWOTH)) ||
+            if ((!S_ISLNK(st.st_mode) && (st.st_mode & (S_IWGRP | S_IWOTH))) ||
                 (buildUser.enabled() && st.st_uid != buildUser.getUID()))
                 throw BuildError(format("suspicious ownership or permission on `%1%'; rejecting this build output") % path);
 #endif