forked from mirrors/nixpkgs
nbd: update to version 3.14
This commit is contained in:
parent
5a6d6d4451
commit
545040811b
|
@ -1,13 +1,15 @@
|
|||
{ stdenv, fetchurl, pkgconfig, glib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "nbd-3.12.1";
|
||||
name = "nbd-3.14";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/nbd/${name}.tar.xz";
|
||||
sha256 = "1pkkid657zgjymwxv3fm32cxnq9llfz29rl15vp6mn42vnzbj1di";
|
||||
sha256 = "0cc6wznvkgjv0fxsj3diy92qfsjrsw92m7yq13f044qarh726gad";
|
||||
};
|
||||
|
||||
patches = [ ./dont-run-make-in-broken-systemd-subdir.patch ];
|
||||
|
||||
buildInputs =
|
||||
[ pkgconfig glib ]
|
||||
++ stdenv.lib.optional (stdenv ? glibc) stdenv.glibc.linuxHeaders;
|
||||
|
@ -17,8 +19,7 @@ stdenv.mkDerivation rec {
|
|||
cp README.md "$out/share/doc/${name}/"
|
||||
'';
|
||||
|
||||
# The test suite doesn't succeed in chroot builds.
|
||||
doCheck = false;
|
||||
doCheck = true;
|
||||
|
||||
# Glib calls `clock_gettime', which is in librt. Linking that library
|
||||
# here ensures that a proper rpath is added to the executable so that
|
||||
|
|
|
@ -0,0 +1,12 @@
|
|||
diff -ubr nbd-3.14-orig/Makefile.in nbd-3.14-new/Makefile.in
|
||||
--- nbd-3.14-orig/Makefile.in 2016-09-19 15:37:30.904176475 +0200
|
||||
+++ nbd-3.14-new/Makefile.in 2016-09-19 15:39:43.813543062 +0200
|
||||
@@ -403,7 +403,7 @@
|
||||
top_build_prefix = @top_build_prefix@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
-SUBDIRS = . man doc tests systemd gznbd
|
||||
+SUBDIRS = . man doc tests gznbd
|
||||
sbin_PROGRAMS = @NBD_CLIENT_NAME@
|
||||
noinst_LTLIBRARIES = libnbdsrv.la libcliserv.la
|
||||
libcliserv_la_SOURCES = cliserv.h cliserv.c
|
Loading…
Reference in a new issue