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

Merge pull request #42466 from ajs124/nbd

Browse Source 
nbd: 3.14 -> 3.17
This commit is contained in:
Matthew Bauer 2018-06-28 22:05:32 -04:00 committed by GitHub
commit de32f31446
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/networking/nbd/default.nix
View File

@ -1,15 +1,13 @@
{ stdenv, fetchurl, pkgconfig, glib }:
stdenv.mkDerivation rec {
name = "nbd-3.14";
name = "nbd-3.17";
src = fetchurl {
url = "mirror://sourceforge/nbd/${name}.tar.xz";
sha256 = "0cc6wznvkgjv0fxsj3diy92qfsjrsw92m7yq13f044qarh726gad";
sha256 = "12fil2hb3gkxslr3nl9kak93n4iyhfs3zdwrmx9vjcxblfqnnp6r";
};
patches = [ ./dont-run-make-in-broken-systemd-subdir.patch ];
buildInputs =
[ pkgconfig glib ]
++ stdenv.lib.optional (stdenv ? glibc) stdenv.glibc.linuxHeaders;

12
pkgs/tools/networking/nbd/dont-run-make-in-broken-systemd-subdir.patch
View File

@ -1,12 +0,0 @@
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