diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-07-19 08:06:14 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-07-19 08:09:29 +0200 |
| commit | 9a80550cc461fe364adae86478bc51dce564e596 (patch) | |
| tree | a8b468f2ce6bdee6b345c3a7b7bc412b1efd583f /pkgs/tools/security | |
| parent | 7acbdcd02b52fd99a826b16c832888dbff64088f (diff) | |
| parent | 4efbe9620569c977cab38609de34e00d81c819fd (diff) | |
| download | nixlib-9a80550cc461fe364adae86478bc51dce564e596.tar nixlib-9a80550cc461fe364adae86478bc51dce564e596.tar.gz nixlib-9a80550cc461fe364adae86478bc51dce564e596.tar.bz2 nixlib-9a80550cc461fe364adae86478bc51dce564e596.tar.lz nixlib-9a80550cc461fe364adae86478bc51dce564e596.tar.xz nixlib-9a80550cc461fe364adae86478bc51dce564e596.tar.zst nixlib-9a80550cc461fe364adae86478bc51dce564e596.zip | |
Merge branch 'staging', discussion #8844
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/crackxls/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/security/pinentry/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/security/sbsigntool/default.nix | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/tools/security/crackxls/default.nix b/pkgs/tools/security/crackxls/default.nix index 48210c11ad90..c8ea45a39dbe 100644 --- a/pkgs/tools/security/crackxls/default.nix +++ b/pkgs/tools/security/crackxls/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { installPhase = '' - mkdir $out/bin + mkdir -p $out/bin cp crackxls2003 $out/bin/ ''; diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 6c87d8062eca..7b8e2fe27616 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -19,6 +19,10 @@ stdenv.mkDerivation rec { buildInputs = [ libcap gtk2 ncurses qt4 ]; + prePatch = '' + substituteInPlace pinentry/pinentry-curses.c --replace ncursesw ncurses + ''; + # configure cannot find moc on its own preConfigure = stdenv.lib.optionalString (qt4 != null) '' export QTDIR="${qt4}" diff --git a/pkgs/tools/security/sbsigntool/default.nix b/pkgs/tools/security/sbsigntool/default.nix index 1571720a0b9b..4cc5e2505d13 100644 --- a/pkgs/tools/security/sbsigntool/default.nix +++ b/pkgs/tools/security/sbsigntool/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { patches = [ ./autoconf.patch ]; + prePatch = "patchShebangs ."; + buildInputs = [ autoconf automake utillinux openssl libuuid gnu-efi binutils pkgconfig help2man ]; configurePhase = '' |