about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDanylo Hlynskyi <abcz2.uprola@gmail.com>2019-07-16 21:11:50 +0300
committerGitHub <noreply@github.com>2019-07-16 21:11:50 +0300
commit70d6271e4736e8da3516e2e584b6bee312bb1dda (patch)
treebad79c09a98c33c9249f334534e59e58f0daeca2
parent2e4fe8db89be78313282fbe002d8ea921931dbe8 (diff)
parent6900a327ad5be1b8ceed10c515f6dd26d816c7ca (diff)
downloadnixlib-70d6271e4736e8da3516e2e584b6bee312bb1dda.tar
nixlib-70d6271e4736e8da3516e2e584b6bee312bb1dda.tar.gz
nixlib-70d6271e4736e8da3516e2e584b6bee312bb1dda.tar.bz2
nixlib-70d6271e4736e8da3516e2e584b6bee312bb1dda.tar.lz
nixlib-70d6271e4736e8da3516e2e584b6bee312bb1dda.tar.xz
nixlib-70d6271e4736e8da3516e2e584b6bee312bb1dda.tar.zst
nixlib-70d6271e4736e8da3516e2e584b6bee312bb1dda.zip
Merge pull request #64421 from rycee/bugfix/writeTextDir-with-slash
trivial-builders: support '/' in writeTextDir
-rw-r--r--pkgs/build-support/trivial-builders.nix10
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index 5706a98f6008..0bfe14a85393 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -94,17 +94,21 @@ rec {
 
   /*
    * Writes a text file to nix store in a specific directory with no
-   * optional parameters available. Name passed is the destination.
+   * optional parameters available.
    *
    * Example:
-   * # Writes contents of file to /nix/store/<store path>/<name>
+   * # Writes contents of file to /nix/store/<store path>/share/my-file
    * writeTextDir "share/my-file"
    *   ''
    *   Contents of File
    *   '';
    *
   */
-  writeTextDir = name: text: writeTextFile {inherit name text; destination = "/${name}";};
+  writeTextDir = path: text: writeTextFile {
+    inherit text;
+    name = builtins.baseNameOf path;
+    destination = "/${path}";
+  };
 
   /*
    * Writes a text file to /nix/store/<store path> and marks the file as