diff options
| author | Shea Levy <shea@shealevy.com> | 2018-03-01 14:38:53 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2018-03-01 14:38:53 -0500 |
| commit | fec543436d4d35dacde01a9e8b69a2781841f901 (patch) | |
| tree | b44b65ddbc7482e767d562f3f27c523c9ffbfcc0 /nixos/modules/services/network-filesystems | |
| parent | e70f61f5a19b00337082ab28a5013e0b440bda92 (diff) | |
| download | nixlib-fec543436d4d35dacde01a9e8b69a2781841f901.tar nixlib-fec543436d4d35dacde01a9e8b69a2781841f901.tar.gz nixlib-fec543436d4d35dacde01a9e8b69a2781841f901.tar.bz2 nixlib-fec543436d4d35dacde01a9e8b69a2781841f901.tar.lz nixlib-fec543436d4d35dacde01a9e8b69a2781841f901.tar.xz nixlib-fec543436d4d35dacde01a9e8b69a2781841f901.tar.zst nixlib-fec543436d4d35dacde01a9e8b69a2781841f901.zip | |
nixos: Move uses of stdenv.shell to runtimeShell.
Diffstat (limited to 'nixos/modules/services/network-filesystems')
| -rw-r--r-- | nixos/modules/services/network-filesystems/xtreemfs.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/network-filesystems/yandex-disk.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/network-filesystems/xtreemfs.nix b/nixos/modules/services/network-filesystems/xtreemfs.nix index 0c6714563d8a..95d7641e8b53 100644 --- a/nixos/modules/services/network-filesystems/xtreemfs.nix +++ b/nixos/modules/services/network-filesystems/xtreemfs.nix @@ -11,7 +11,7 @@ let home = cfg.homeDir; startupScript = class: configPath: pkgs.writeScript "xtreemfs-osd.sh" '' - #! ${pkgs.stdenv.shell} + #! ${pkgs.runtimeShell} JAVA_HOME="${pkgs.jdk}" JAVADIR="${xtreemfs}/share/java" JAVA_CALL="$JAVA_HOME/bin/java -ea -cp $JAVADIR/XtreemFS.jar:$JAVADIR/BabuDB.jar:$JAVADIR/Flease.jar:$JAVADIR/protobuf-java-2.5.0.jar:$JAVADIR/Foundation.jar:$JAVADIR/jdmkrt.jar:$JAVADIR/jdmktk.jar:$JAVADIR/commons-codec-1.3.jar" diff --git a/nixos/modules/services/network-filesystems/yandex-disk.nix b/nixos/modules/services/network-filesystems/yandex-disk.nix index 4de206641331..44b0edf62018 100644 --- a/nixos/modules/services/network-filesystems/yandex-disk.nix +++ b/nixos/modules/services/network-filesystems/yandex-disk.nix @@ -99,10 +99,10 @@ in exit 1 fi - ${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${u} \ + ${pkgs.su}/bin/su -s ${pkgs.runtimeShell} ${u} \ -c '${pkgs.yandex-disk}/bin/yandex-disk token -p ${cfg.password} ${cfg.username} ${dir}/token' - ${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${u} \ + ${pkgs.su}/bin/su -s ${pkgs.runtimeShell} ${u} \ -c '${pkgs.yandex-disk}/bin/yandex-disk start --no-daemon -a ${dir}/token -d ${cfg.directory} --exclude-dirs=${cfg.excludes}' ''; |