Unverified Commit dc0e094b authored by Wolfgang Walther's avatar Wolfgang Walther
Browse files

nixos/installer: replace substituteAll with replaceVarsWith for tools

parent b9ea4817

nixos/modules/installer/tools/tools.nix

+21 −17
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
{ config, lib, pkgs, ... }:



let

  makeProg = args: pkgs.substituteAll (args // {

  makeProg = args: pkgs.replaceVarsWith (args // {

    dir = "bin";

    isExecutable = true;

    nativeBuildInputs = [
@@ -18,18 +18,21 @@ let 
  nixos-generate-config = makeProg {

    name = "nixos-generate-config";

    src = ./nixos-generate-config.pl;

    replacements = {

      perl = "${pkgs.perl.withPackages (p: [ p.FileSlurp ])}/bin/perl";

      hostPlatformSystem = pkgs.stdenv.hostPlatform.system;

      detectvirt = "${config.systemd.package}/bin/systemd-detect-virt";

      btrfs = "${pkgs.btrfs-progs}/bin/btrfs";

      inherit (config.system.nixos-generate-config) configuration desktopConfiguration;

      xserverEnabled = config.services.xserver.enable;

    };

    manPage = ./manpages/nixos-generate-config.8;

  };



  nixos-version = makeProg {

    name = "nixos-version";

    src = ./nixos-version.sh;

    replacements = {

      inherit (pkgs) runtimeShell;

      inherit (config.system.nixos) version codeName revision;

      inherit (config.system) configurationRevision;
@@ -40,6 +43,7 @@ let 
      } // lib.optionalAttrs (config.system.configurationRevision != null) {

        configurationRevision = config.system.configurationRevision;

      });

    };

    manPage = ./manpages/nixos-version.8;

  };