Merge branch 'staging', discussion #8844

2015-07-19 08:09:29 +02:00
parent 7acbdcd02b 4efbe96205
commit 9a80550cc4
272 changed files with 4785 additions and 1517 deletions
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {

  installPhase =
  ''
-    mkdir $out/bin
+    mkdir -p $out/bin
    cp crackxls2003 $out/bin/
  '';

@@ -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}"
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {

  patches = [ ./autoconf.patch ];

+  prePatch = "patchShebangs .";
+
  buildInputs = [ autoconf automake utillinux openssl libuuid gnu-efi binutils pkgconfig help2man ];

  configurePhase = ''