From 236bcc73154eca6a64039ffc7314c3fe620852d7 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Sat, 2 Dec 2023 12:14:48 -0500
Subject: [PATCH 1/5] nbd: format with nixpkgs-fmt

---
 pkgs/tools/networking/nbd/default.nix | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix
index e0efbe31f8eb..f326d24e510f 100644
--- a/pkgs/tools/networking/nbd/default.nix
+++ b/pkgs/tools/networking/nbd/default.nix
@@ -1,4 +1,14 @@
-{ lib, stdenv, fetchurl, pkg-config, glib, which, bison, nixosTests, linuxHeaders, gnutls }:
+{ lib
+, stdenv
+, fetchurl
+, pkg-config
+, glib
+, which
+, bison
+, nixosTests
+, linuxHeaders
+, gnutls
+}:
 
 stdenv.mkDerivation rec {
   pname = "nbd";
@@ -9,10 +19,18 @@ stdenv.mkDerivation rec {
     hash = "sha256-9cj9D8tXsckmWU0OV/NWQy7ghni+8dQNCI8IMPDL3Qo=";
   };
 
-  buildInputs = [ glib gnutls ]
-    ++ lib.optionals stdenv.isLinux [ linuxHeaders ];
+  nativeBuildInputs = [
+    pkg-config
+    which
+    bison
+  ];
 
-  nativeBuildInputs = [ pkg-config which bison ];
+  buildInputs = [
+    glib
+    gnutls
+  ] ++ lib.optionals stdenv.isLinux [
+    linuxHeaders
+  ];
 
   postInstall = ''
     mkdir -p "$out/share/doc/nbd-${version}"

From 268b144407ffcbd8e584364fe269a36b1a6de963 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Sat, 2 Dec 2023 12:20:09 -0500
Subject: [PATCH 2/5] nbd: add nickcao to maintainers

---
 pkgs/tools/networking/nbd/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix
index f326d24e510f..cf9da8bbac33 100644
--- a/pkgs/tools/networking/nbd/default.nix
+++ b/pkgs/tools/networking/nbd/default.nix
@@ -48,5 +48,6 @@ stdenv.mkDerivation rec {
     description = "Map arbitrary files as block devices over the network";
     license = lib.licenses.gpl2;
     platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ nickcao ];
   };
 }

From 8c124f6e1e9b0ef4ccec68e371a84b537984d1bd Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Sat, 2 Dec 2023 12:23:15 -0500
Subject: [PATCH 3/5] nbd: add missing libnl dependency

---
 pkgs/tools/networking/nbd/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix
index cf9da8bbac33..c3e714bde84c 100644
--- a/pkgs/tools/networking/nbd/default.nix
+++ b/pkgs/tools/networking/nbd/default.nix
@@ -6,6 +6,7 @@
 , which
 , bison
 , nixosTests
+, libnl
 , linuxHeaders
 , gnutls
 }:
@@ -29,6 +30,7 @@ stdenv.mkDerivation rec {
     glib
     gnutls
   ] ++ lib.optionals stdenv.isLinux [
+    libnl
     linuxHeaders
   ];
 

From 52f1d9b03ae38126e7f648634fcad35897f464ed Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Thu, 7 Dec 2023 21:23:31 -0500
Subject: [PATCH 4/5] nbd: set sysconfdir to /etc

---
 pkgs/tools/networking/nbd/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix
index c3e714bde84c..d18ee47dff65 100644
--- a/pkgs/tools/networking/nbd/default.nix
+++ b/pkgs/tools/networking/nbd/default.nix
@@ -34,6 +34,10 @@ stdenv.mkDerivation rec {
     linuxHeaders
   ];
 
+  configureFlags = [
+    "--sysconfdir=/etc"
+  ];
+
   postInstall = ''
     mkdir -p "$out/share/doc/nbd-${version}"
     cp README.md "$out/share/doc/nbd-${version}/"

From d12f11bbb1b9b49b5deb8447062ce03eb36ccbfa Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Thu, 7 Dec 2023 21:23:47 -0500
Subject: [PATCH 5/5] nbd: drop ad-hoc copying of readme, the manpages already
 cover everything

---
 pkgs/tools/networking/nbd/default.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix
index d18ee47dff65..c7cb5632dfe4 100644
--- a/pkgs/tools/networking/nbd/default.nix
+++ b/pkgs/tools/networking/nbd/default.nix
@@ -38,11 +38,6 @@ stdenv.mkDerivation rec {
     "--sysconfdir=/etc"
   ];
 
-  postInstall = ''
-    mkdir -p "$out/share/doc/nbd-${version}"
-    cp README.md "$out/share/doc/nbd-${version}/"
-  '';
-
   doCheck = !stdenv.isDarwin;
 
   passthru.tests = {