diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2011-03-04 13:19:04 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2011-03-04 13:19:04 +0000 |
| commit | e7fc725ddbd8c1c094aaf97f233d131334780ab6 (patch) | |
| tree | 58f052cfe635eb3587004d0ce41e02cb5f04c0da /pkgs/servers/http/myserver | |
| parent | 69e259eaf2e6865a50a562581bdc084074f57c4a (diff) | |
| download | nixlib-e7fc725ddbd8c1c094aaf97f233d131334780ab6.tar nixlib-e7fc725ddbd8c1c094aaf97f233d131334780ab6.tar.gz nixlib-e7fc725ddbd8c1c094aaf97f233d131334780ab6.tar.bz2 nixlib-e7fc725ddbd8c1c094aaf97f233d131334780ab6.tar.lz nixlib-e7fc725ddbd8c1c094aaf97f233d131334780ab6.tar.xz nixlib-e7fc725ddbd8c1c094aaf97f233d131334780ab6.tar.zst nixlib-e7fc725ddbd8c1c094aaf97f233d131334780ab6.zip | |
GNU MyServer: Make the binary installable.
svn path=/nixpkgs/trunk/; revision=26162
Diffstat (limited to 'pkgs/servers/http/myserver')
| -rw-r--r-- | pkgs/servers/http/myserver/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/servers/http/myserver/installable-binary.patch | 14 |
2 files changed, 16 insertions, 1 deletions
diff --git a/pkgs/servers/http/myserver/default.nix b/pkgs/servers/http/myserver/default.nix index 3f491810819b..0b2c971e6e54 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 000000000000..346e76afd5ec --- /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) + |