public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor to use autoreconfHook where possible

Browse Source 
Close #12446.
This commit is contained in:
Robin Gloster
2016-01-18 10:45:31 +01:00
committed by Vladimír Čunát
parent 620c147cce
commit 53b389327e
50 changed files with 188 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/shellinabox/default.nix
+2 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pam, openssl, openssh, shadow, makeWrapper }:
{ stdenv, fetchFromGitHub, autoreconfHook, pam, openssl, openssh, shadow, makeWrapper }:
stdenv.mkDerivation rec {
version = "2.19";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
patches = [ ./shellinabox-minus.patch ];
buildInputs = [ autoconf automake libtool pam openssl openssh makeWrapper];
buildInputs = [ autoreconfHook pam openssl openssh makeWrapper ];
# Disable GSSAPIAuthentication errors. Also, paths in certain source files are
# hardcoded. Replace the hardcoded paths with correct paths.
@@ -23,7 +23,6 @@ stdenv.mkDerivation rec {
substituteInPlace ./shellinabox/service.c --replace "/bin/login" "${shadow}/bin/login"
substituteInPlace ./shellinabox/launcher.c --replace "/bin/login" "${shadow}/bin/login"
substituteInPlace ./libhttp/ssl.c --replace "/usr/bin" "${openssl}/bin"
autoreconf -vfi
'';
postInstall = ''