Commit d3692ddf authored by Yueh-Shun Li's avatar Yueh-Shun Li Committed by Yueh-Shun Li
Browse files

singularity-tools: drop override argument storeDir

parent c2fa248b
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -124,6 +124,8 @@
  Processes also now run as a dynamically allocated user by default instead of
  root.

- `singularity-tools` have the `storeDir` argument removed from its override interface and use `builtins.storeDir` instead.

- The `budgie` and `budgiePlugins` scope have been removed and their packages
  moved into the top level scope (i.e., `budgie.budgie-desktop` is now
  `budgie-desktop`)
+3 −4
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@
  bashInteractive,
  runtimeShell,
  singularity,
  storeDir ? builtins.storeDir,
}:

let
@@ -83,10 +82,10 @@ rec {

            # Run root script
            ${lib.optionalString (runAsRoot != null) ''
              mkdir -p ./${storeDir}
              mount --rbind ${storeDir} ./${storeDir}
              mkdir -p ./${builtins.storeDir}
              mount --rbind "${builtins.storeDir}" ./${builtins.storeDir}
              unshare -imnpuf --mount-proc chroot ./ ${runAsRootFile}
              umount -R ./${storeDir}
              umount -R ./${builtins.storeDir}
            ''}

            # Build /bin and copy across closure