diff options
author | Ben Siraphob <bensiraphob@gmail.com> | 2021-02-07 16:17:39 +0700 |
---|---|---|
committer | Ben Siraphob <bensiraphob@gmail.com> | 2021-02-19 20:09:16 +0700 |
commit | e03c068af5c9ca950214cd6c3b5cfe67f595da88 (patch) | |
tree | 3a2072763efa4dae7237eeecf46fc6a95ddcd215 /pkgs/tools/security | |
parent | 06c2bba257d77f2aeada7f943244d9afd5998645 (diff) |
treewide: makeWrapper buildInputs to nativeBuildInputs
Diffstat (limited to 'pkgs/tools/security')
-rw-r--r-- | pkgs/tools/security/ecryptfs/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/security/ecryptfs/helper.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/security/enpass/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/security/gen-oath-safe/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/security/ipscan/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/security/kpcli/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/security/metasploit/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/security/open-ecard/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/security/pass/rofi-pass.nix | 2 |
9 files changed, 13 insertions, 10 deletions
diff --git a/pkgs/tools/security/ecryptfs/default.nix b/pkgs/tools/security/ecryptfs/default.nix index 569b83feb9aeb..cd90342738ed8 100644 --- a/pkgs/tools/security/ecryptfs/default.nix +++ b/pkgs/tools/security/ecryptfs/default.nix @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { configureFlags = lib.optionals (!enablePython) [ "--disable-pywrap" ]; - nativeBuildInputs = [ pkg-config ] + nativeBuildInputs = [ pkg-config makeWrapper ] # if python2 support is requested, it is needed at builtime as well as runtime. ++ lib.optionals (enablePython) [ python2 ] ; - buildInputs = [ perl nss nspr pam intltool makeWrapper ] + buildInputs = [ perl nss nspr pam intltool ] ++ lib.optionals (enablePython) [ python2 ] ; propagatedBuildInputs = [ coreutils gettext cryptsetup lvm2 rsync keyutils which ]; diff --git a/pkgs/tools/security/ecryptfs/helper.nix b/pkgs/tools/security/ecryptfs/helper.nix index ecd12a2738d82..bd558b7ab66db 100644 --- a/pkgs/tools/security/ecryptfs/helper.nix +++ b/pkgs/tools/security/ecryptfs/helper.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { phases = [ "installPhase" ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; # Do not hardcode PATH to ${ecryptfs} as we need the script to invoke executables from /run/wrappers/bin installPhase = '' diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix index 7e2c0fcdb338f..107bf56cf8282 100644 --- a/pkgs/tools/security/enpass/default.nix +++ b/pkgs/tools/security/enpass/default.nix @@ -59,7 +59,8 @@ let maintainers = with maintainers; [ ewok ]; }; - buildInputs = [makeWrapper dpkg]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [dpkg]; phases = [ "unpackPhase" "installPhase" ]; unpackPhase = "dpkg -X $src ."; diff --git a/pkgs/tools/security/gen-oath-safe/default.nix b/pkgs/tools/security/gen-oath-safe/default.nix index 20ee69eeaea23..19e5f16924a53 100644 --- a/pkgs/tools/security/gen-oath-safe/default.nix +++ b/pkgs/tools/security/gen-oath-safe/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1914z0jgj7lni0nf3hslkjgkv87mhxdr92cmhmbzhpjgjgr23ydp"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/pkgs/tools/security/ipscan/default.nix b/pkgs/tools/security/ipscan/default.nix index a5b0fe8d92899..d1c56beb08164 100644 --- a/pkgs/tools/security/ipscan/default.nix +++ b/pkgs/tools/security/ipscan/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sourceRoot = "."; unpackCmd = "${dpkg}/bin/dpkg-deb -x $src ."; - buildInputs = [ makeWrapper jdk ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jdk ]; installPhase = '' mkdir -p $out/share diff --git a/pkgs/tools/security/kpcli/default.nix b/pkgs/tools/security/kpcli/default.nix index d0e260bb6775d..37af42e33ccf6 100644 --- a/pkgs/tools/security/kpcli/default.nix +++ b/pkgs/tools/security/kpcli/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1srd6vrqgjlf906zdyxp4bg6gihkxn62cpzyfv0zzpsqsj13iwh1"; }; - buildInputs = [ makeWrapper perl ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perl ]; phases = [ "installPhase" "fixupPhase" ]; diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 619cc9c3192c4..f2358d1f80d6e 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { sha256 = "sha256-DD/nFbSNs3nVNe+W+5zAmDlvMCseYuWWpKX9Dp+9Etc="; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; dontPatchELF = true; # stay away from exploit executables diff --git a/pkgs/tools/security/open-ecard/default.nix b/pkgs/tools/security/open-ecard/default.nix index c46d5b65cd8ef..5c07add90563c 100644 --- a/pkgs/tools/security/open-ecard/default.nix +++ b/pkgs/tools/security/open-ecard/default.nix @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { phases = "installPhase"; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; desktopItem = makeDesktopItem { name = appName; diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix index b6547deb560ab..3b5aedf81a80c 100644 --- a/pkgs/tools/security/pass/rofi-pass.nix +++ b/pkgs/tools/security/pass/rofi-pass.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "131jpcwyyzgzjn9lx4k1zn95pd68pjw4i41jfzcp9z9fnazyln5n"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; dontBuild = true; |