diff options
author | Artturin <Artturin@artturin.com> | 2022-09-25 05:49:25 +0300 |
---|---|---|
committer | Artturin <Artturin@artturin.com> | 2022-09-26 17:53:26 +0300 |
commit | 0734f54ef262ad642eec1166a416bae86779ed9f (patch) | |
tree | 27314f4f10704420dfba1f529dbc258ca7b58f94 /pkgs/tools/security | |
parent | 6910a4eea0038728a2f10ce84122806f2cb6b170 (diff) | |
download | nixlib-0734f54ef262ad642eec1166a416bae86779ed9f.tar nixlib-0734f54ef262ad642eec1166a416bae86779ed9f.tar.gz nixlib-0734f54ef262ad642eec1166a416bae86779ed9f.tar.bz2 nixlib-0734f54ef262ad642eec1166a416bae86779ed9f.tar.lz nixlib-0734f54ef262ad642eec1166a416bae86779ed9f.tar.xz nixlib-0734f54ef262ad642eec1166a416bae86779ed9f.tar.zst nixlib-0734f54ef262ad642eec1166a416bae86779ed9f.zip |
treewide: move pkg-config, autoreconfHook, intltool to nativeBuildInputs
found with nixpkgs-lint
Diffstat (limited to 'pkgs/tools/security')
-rw-r--r-- | pkgs/tools/security/chrome-token-signing/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/security/ecryptfs/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/security/fpm2/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/security/gnupg-pkcs11-scd/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/security/metasploit/shell.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/security/onioncircuits/default.nix | 2 |
6 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/tools/security/chrome-token-signing/default.nix b/pkgs/tools/security/chrome-token-signing/default.nix index 18104aa7710d..8081c7ef6eb5 100644 --- a/pkgs/tools/security/chrome-token-signing/default.nix +++ b/pkgs/tools/security/chrome-token-signing/default.nix @@ -11,7 +11,8 @@ mkDerivation rec { sha256 = "sha256-wKy/RVR7jx5AkMJgHXsuV+jlzyfH5nDRggcIUgh2ML4="; }; - buildInputs = [ qmake pcsclite pkg-config ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ qmake pcsclite ]; dontUseQmakeConfigure = true; patchPhase = '' diff --git a/pkgs/tools/security/ecryptfs/default.nix b/pkgs/tools/security/ecryptfs/default.nix index cd90342738ed..777aaea41ec2 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 makeWrapper ] + nativeBuildInputs = [ pkg-config makeWrapper intltool ] # if python2 support is requested, it is needed at builtime as well as runtime. ++ lib.optionals (enablePython) [ python2 ] ; - buildInputs = [ perl nss nspr pam intltool ] + buildInputs = [ perl nss nspr pam ] ++ lib.optionals (enablePython) [ python2 ] ; propagatedBuildInputs = [ coreutils gettext cryptsetup lvm2 rsync keyutils which ]; diff --git a/pkgs/tools/security/fpm2/default.nix b/pkgs/tools/security/fpm2/default.nix index 15d5a5adcffb..69e6c7f02817 100644 --- a/pkgs/tools/security/fpm2/default.nix +++ b/pkgs/tools/security/fpm2/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1lfzja3vzd6l6hfvw8gvg4qkl5iy6gra5pa8gjlps9l63k2bjfhz"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gnupg gtk3 libxml2 intltool nettle ]; + nativeBuildInputs = [ pkg-config intltool ]; + buildInputs = [ gnupg gtk3 libxml2 nettle ]; meta = with lib; { description = "GTK2 port from Figaro's Password Manager originally developed by John Conneely, with some new enhancements"; diff --git a/pkgs/tools/security/gnupg-pkcs11-scd/default.nix b/pkgs/tools/security/gnupg-pkcs11-scd/default.nix index 1e46df40f85f..22c11b3f2b1f 100644 --- a/pkgs/tools/security/gnupg-pkcs11-scd/default.nix +++ b/pkgs/tools/security/gnupg-pkcs11-scd/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-Kb8p53gPkhxtOhH2COKwSDwbtRDFr6hHMJAkndV8Ukk="; }; - buildInputs = [ pkcs11helper pkg-config openssl ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ pkcs11helper openssl ]; configureFlags = [ "--with-libgpg-error-prefix=${libgpg-error.dev}" diff --git a/pkgs/tools/security/metasploit/shell.nix b/pkgs/tools/security/metasploit/shell.nix index e4bae57b6866..ccd510f63af2 100644 --- a/pkgs/tools/security/metasploit/shell.nix +++ b/pkgs/tools/security/metasploit/shell.nix @@ -2,6 +2,7 @@ with import <nixpkgs> {}; stdenv.mkDerivation { name = "env"; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ bundix git @@ -9,7 +10,6 @@ stdenv.mkDerivation { libpcap libxml2 libxslt - pkg-config postgresql ruby.devEnv sqlite diff --git a/pkgs/tools/security/onioncircuits/default.nix b/pkgs/tools/security/onioncircuits/default.nix index 329de10ff6bb..249762781e7d 100644 --- a/pkgs/tools/security/onioncircuits/default.nix +++ b/pkgs/tools/security/onioncircuits/default.nix @@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec { }; nativeBuildInputs = [ intltool ]; - buildInputs = [ intltool gtk3 gobject-introspection ]; + buildInputs = [ gtk3 gobject-introspection ]; propagatedBuildInputs = with python3.pkgs; [ stem distutils_extra pygobject3 ]; postFixup = '' |