diff --git a/nix-on-droid/default.nix b/nix-on-droid/default.nix index a590de0..75180c3 100644 --- a/nix-on-droid/default.nix +++ b/nix-on-droid/default.nix @@ -1,6 +1,6 @@ -# Copyright (c) 2019-2020, see AUTHORS. Licensed under MIT License, see LICENSE. +# Copyright (c) 2019-2022, see AUTHORS. Licensed under MIT License, see LICENSE. -{ bash, coreutils, lib, nix, nix_2_4, runCommand }: +{ bash, coreutils, lib, nix, runCommand }: runCommand "nix-on-droid" @@ -14,6 +14,5 @@ runCommand substituteInPlace $out/bin/nix-on-droid \ --subst-var-by bash "${bash}" \ --subst-var-by coreutils "${coreutils}" \ - --subst-var-by nix "${nix}" \ - --subst-var-by nixge24 "${if lib.versionAtLeast nix.version "2.4pre" then nix else nix_2_4}" + --subst-var-by nix "${nix}" '' diff --git a/nix-on-droid/nix-on-droid.sh b/nix-on-droid/nix-on-droid.sh index cbcafdc..f1b34fb 100644 --- a/nix-on-droid/nix-on-droid.sh +++ b/nix-on-droid/nix-on-droid.sh @@ -28,15 +28,13 @@ function nixActivationPackage() { local extraArgs=("${@:2}" --extra-experimental-features nix-command "${PASSTHROUGH_OPTS[@]}") - local nix=nix if [[ -n "${FLAKE_CONFIG_URI}" ]]; then - nix=@nixge24@/bin/nix extraArgs+=(--impure "${FLAKE_CONFIG_URI}.activationPackage") else extraArgs+=(--file "" activationPackage) fi - $nix "${command}" "${extraArgs[@]}" + nix "${command}" "${extraArgs[@]}" }