Integrate requested changes from SuperSandro2000add-nemu

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>

1 files changed, 16 insertions, 26 deletions

diff --git a/pkgs/applications/misc/nemu/default.nix b/pkgs/applications/misc/nemu/default.nix
index 187610e254ac..736b58cc310d 100644
--- a/pkgs/applications/misc/nemu/default.nix
+++ b/pkgs/applications/misc/nemu/default.nix
@@ -1,6 +1,6 @@
 { stdenv, config, lib, fetchFromGitHub
 , cmake
-, pkgconfig
+, pkg-config
 , gettext
 , libpthreadstubs
 , libudev
@@ -9,10 +9,10 @@
 , qemu
 , sqlite
 
-, libxml2 ? null
-, libarchive ? null
-, graphviz ? null
-, dbus ? null
+, libxml2
+, libarchive
+, graphviz
+, dbus
 
 , debugBuild ? false
 , ovfSupport ? true
@@ -23,11 +23,6 @@
 , withDbus ? false
 }:
 
-assert ovfSupport     -> libxml2    != null;
-assert ovfSupport     -> libarchive != null;
-assert withNetworkMap -> graphviz   != null;
-assert withDbus       -> dbus       != null;
-
 stdenv.mkDerivation rec {
   pname = "nemu";
   version = "2020-03-11";
@@ -44,7 +39,7 @@ stdenv.mkDerivation rec {
     (isEnabled "MACVTAP")
   ];
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
 
   buildInputs = [
     gettext
@@ -56,19 +51,16 @@ stdenv.mkDerivation rec {
     ncurses
     qemu
     sqlite
-  ]
-    ++ (lib.optional withNetworkMap graphviz)
-    ++ (lib.optional withDbus       dbus);
-
-  cmakeFlags = []
-    ++ (lib.optional debugBuild "-DNM_DEBUG=ON")
-    ++ (lib.optional ovfSupport "-DNM_WITH_OVF_SUPPORT=ON")
-    ++ (lib.optional saveVMSupport "-DNM_SAVEVM_SNAPSHOTS=ON")
-    ++ (lib.optional withVNCClientSupport "-DNM_WITH_VNC_CLIENT=ON")
-    ++ (lib.optional withSpice "-DNM_WITH_SPICE=ON")
-    ++ (lib.optional withNetworkMap "-DNM_WITH_NETWORK_MAP=ON")
-    ++ (lib.optional withDbus "-DNM_WITH_DBUS=ON")
-    ;
+  ] ++ lib.optional withNetworkMap graphviz
+    ++(lib.optional withDbus dbus;
+
+  cmakeFlags = lib.optional debugBuild "-DNM_DEBUG=ON"
+    ++ lib.optional ovfSupport "-DNM_WITH_OVF_SUPPORT=ON"
+    ++ lib.optional saveVMSupport "-DNM_SAVEVM_SNAPSHOTS=ON"
+    ++ lib.optional withVNCClientSupport "-DNM_WITH_VNC_CLIENT=ON"
+    ++ lib.optional withSpice "-DNM_WITH_SPICE=ON"
+    ++ lib.optional withNetworkMap "-DNM_WITH_NETWORK_MAP=ON"
+    ++ lib.optional withDbus "-DNM_WITH_DBUS=ON";
 
   preConfigure = ''
     patchShebangs .
@@ -99,7 +91,6 @@ stdenv.mkDerivation rec {
     substituteInPlace nemu.cfg.sample --replace /usr/bin /run/current-system/sw/bin
     substituteInPlace lang/ru/nemu.po --replace /bin/false /run/current-system/sw/bin/false
     substituteInPlace sh/ntty --replace /usr/bin /run/current-system/sw/bin
-    #mkdir -p $out/share/bash-completion/completions
   '';
 
   preInstall = ''
@@ -114,4 +105,3 @@ stdenv.mkDerivation rec {
     platforms = with stdenv.lib.platforms; linux;
   };
 }
-