diff options
Diffstat (limited to 'krebs/5pkgs')
| -rw-r--r-- | krebs/5pkgs/builders.nix | 2 | ||||
| -rw-r--r-- | krebs/5pkgs/cac-api/default.nix | 2 | ||||
| -rw-r--r-- | krebs/5pkgs/dic/default.nix | 2 | ||||
| -rw-r--r-- | krebs/5pkgs/fortclientsslvpn/default.nix | 2 | ||||
| -rw-r--r-- | krebs/5pkgs/get/default.nix | 2 | ||||
| -rw-r--r-- | krebs/5pkgs/git-hooks/default.nix | 2 | ||||
| -rw-r--r-- | krebs/5pkgs/github-hosts-sync/default.nix | 2 | ||||
| -rw-r--r-- | krebs/5pkgs/hashPassword/default.nix | 2 | ||||
| -rw-r--r-- | krebs/5pkgs/push/default.nix | 2 | 
9 files changed, 9 insertions, 9 deletions
diff --git a/krebs/5pkgs/builders.nix b/krebs/5pkgs/builders.nix index fa51857ba..146e6f9e1 100644 --- a/krebs/5pkgs/builders.nix +++ b/krebs/5pkgs/builders.nix @@ -29,7 +29,7 @@ rec {    execveBin = name: cfg: execve name (cfg // { destination = "/bin/${name}"; });    writeC = name: { destination ? "" }: src: pkgs.runCommand name {} '' -    PATH=${makeSearchPath "bin" (with pkgs; [ +    PATH=${makeBinPath (with pkgs; [        binutils        coreutils        gcc diff --git a/krebs/5pkgs/cac-api/default.nix b/krebs/5pkgs/cac-api/default.nix index 52ada4f1b..85a906e1d 100644 --- a/krebs/5pkgs/cac-api/default.nix +++ b/krebs/5pkgs/cac-api/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation {      mkdir -p $out/bin      { cat <<\EOF      #! ${dash}/bin/dash -    export PATH=${stdenv.lib.makeSearchPath "bin" [ +    export PATH=${stdenv.lib.makeBinPath [        bc        coreutils        curl diff --git a/krebs/5pkgs/dic/default.nix b/krebs/5pkgs/dic/default.nix index 571773d22..3566de8cd 100644 --- a/krebs/5pkgs/dic/default.nix +++ b/krebs/5pkgs/dic/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation {    installPhase =      let -      path = stdenv.lib.makeSearchPath "bin" [ +      path = stdenv.lib.makeBinPath [          coreutils          curl          gnused diff --git a/krebs/5pkgs/fortclientsslvpn/default.nix b/krebs/5pkgs/fortclientsslvpn/default.nix index e1c813479..602766f46 100644 --- a/krebs/5pkgs/fortclientsslvpn/default.nix +++ b/krebs/5pkgs/fortclientsslvpn/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec {    buildInputs = [ makeWrapper ]; -  binPath = lib.makeSearchPath "bin" [ +  binPath = lib.makeBinPath [      coreutils      gawk    ]; diff --git a/krebs/5pkgs/get/default.nix b/krebs/5pkgs/get/default.nix index 13cdeca96..f82c7e8b7 100644 --- a/krebs/5pkgs/get/default.nix +++ b/krebs/5pkgs/get/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation {    installPhase =      let -      path = stdenv.lib.makeSearchPath "bin" [ +      path = stdenv.lib.makeBinPath [          coreutils          gnugrep          gnused diff --git a/krebs/5pkgs/git-hooks/default.nix b/krebs/5pkgs/git-hooks/default.nix index 5697c31be..3aba90535 100644 --- a/krebs/5pkgs/git-hooks/default.nix +++ b/krebs/5pkgs/git-hooks/default.nix @@ -12,7 +12,7 @@ let      #! /bin/sh      set -euf -    export PATH=${makeSearchPath "bin" (with pkgs; [ +    export PATH=${makeBinPath (with pkgs; [        coreutils        git        gnused diff --git a/krebs/5pkgs/github-hosts-sync/default.nix b/krebs/5pkgs/github-hosts-sync/default.nix index b9dcfa9b8..0dcbe7fd8 100644 --- a/krebs/5pkgs/github-hosts-sync/default.nix +++ b/krebs/5pkgs/github-hosts-sync/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation {    installPhase =      let        ca-bundle = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; -      path = stdenv.lib.makeSearchPath "bin" (with pkgs; [ +      path = stdenv.lib.makeBinPath (with pkgs; [          coreutils          findutils          git diff --git a/krebs/5pkgs/hashPassword/default.nix b/krebs/5pkgs/hashPassword/default.nix index a10340cc4..6a7c51c57 100644 --- a/krebs/5pkgs/hashPassword/default.nix +++ b/krebs/5pkgs/hashPassword/default.nix @@ -5,7 +5,7 @@ pkgs.writeScriptBin "hashPassword" ''    # usage: hashPassword    set -euf -  export PATH=${lib.makeSearchPath "bin" (with pkgs; [ +  export PATH=${lib.makeBinPath (with pkgs; [      coreutils      mkpasswd      openssl diff --git a/krebs/5pkgs/push/default.nix b/krebs/5pkgs/push/default.nix index aa17a21a9..9a627fe36 100644 --- a/krebs/5pkgs/push/default.nix +++ b/krebs/5pkgs/push/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation {    installPhase =      let -      path = lib.makeSearchPath "bin" [ +      path = lib.makeBinPath [          coreutils          git          gnumake  | 
