From e7fc725ddbd8c1c094aaf97f233d131334780ab6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 4 Mar 2011 13:19:04 +0000 Subject: [PATCH] GNU MyServer: Make the binary installable. svn path=/nixpkgs/trunk/; revision=26162 --- pkgs/servers/http/myserver/default.nix | 3 ++- .../servers/http/myserver/installable-binary.patch | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 pkgs/servers/http/myserver/installable-binary.patch diff --git a/pkgs/servers/http/myserver/default.nix b/pkgs/servers/http/myserver/default.nix index 3f491810819..0b2c971e6e5 100644 --- a/pkgs/servers/http/myserver/default.nix +++ b/pkgs/servers/http/myserver/default.nix @@ -10,7 +10,8 @@ let version = "0.10"; in sha256 = "0w8njgka54if8ycd9cyxgmqa0ivv7r0rka7gda3x2rfr2z4nxvpb"; }; - patches = [ ./disable-dns-lookup-in-chroot.patch ]; + patches = + [ ./disable-dns-lookup-in-chroot.patch ./installable-binary.patch ]; buildInputs = [ libgcrypt libevent libidn gnutls libxml2 zlib guile texinfo xz ] diff --git a/pkgs/servers/http/myserver/installable-binary.patch b/pkgs/servers/http/myserver/installable-binary.patch new file mode 100644 index 00000000000..346e76afd5e --- /dev/null +++ b/pkgs/servers/http/myserver/installable-binary.patch @@ -0,0 +1,14 @@ +We actually want the `myserver' binary to be installable. Failing to do that +it gets an RPATH pointing to $top_builddir/src/.libs. + +--- myserver-0.10/src/Makefile.in 2010-10-14 12:45:42.000000000 +0200 ++++ myserver-0.10/src/Makefile.in 2011-03-03 22:23:05.000000000 +0100 +@@ -1307,7 +1307,6 @@ libmyserver_la_LIBADD = \ + $(INTLLIBS) $(LDFLAGS) + + myserver_CXXFLAGS = $(AM_CXXFLAGS) $(CXXFLAGS) -DHOST_STR=\"$(build)\" -DPREFIX=\"$(prefix)\" +-myserver_LDFLAGS = -static -no-install + myserver_LDADD = libmyserver.la $(PTHREAD_LIB) $(IDN_LIB) \ + $(XNET_LIB) $(DL_LIB) $(ZLIB_LIB) \ + $(XML_LIBS) $(INTLLIBS) $(LDFLAGS) +