cdmemu: fix cross eval

there's still many improvements that can be done to cdemu expressions

6 files changed, 12 insertions, 13 deletions

diff --git a/pkgs/applications/emulators/cdemu/analyzer.nix b/pkgs/applications/emulators/cdemu/analyzer.nix
index 338c64a24b81a..5b111b80285a9 100644
--- a/pkgs/applications/emulators/cdemu/analyzer.nix
+++ b/pkgs/applications/emulators/cdemu/analyzer.nix
@@ -6,11 +6,10 @@ let pkg = import ./base.nix {
   pkgSha256 = "00906lky0z1m0bdqnjmzxgcb19dzvljhddhh42lixyr53sjp94cc";
 };
 in callPackage pkg {
-  buildInputs = [ glib gtk3 libxml2 gnuplot libmirage makeWrapper
-                  gnome.adwaita-icon-theme gdk-pixbuf librsvg intltool
+  buildInputs = [ glib gtk3 libxml2 gnuplot libmirage gnome.adwaita-icon-theme gdk-pixbuf librsvg
                   python3Packages.python python3Packages.pygobject3 python3Packages.matplotlib ];
   drvParams = {
-    nativeBuildInputs = [ gobject-introspection cmake ];
+    nativeBuildInputs = [ gobject-introspection cmake makeWrapper intltool ];
     postFixup = ''
       wrapProgram $out/bin/image-analyzer \
         --set PYTHONPATH "$PYTHONPATH" \
diff --git a/pkgs/applications/emulators/cdemu/base.nix b/pkgs/applications/emulators/cdemu/base.nix
index 9464bde70bf71..994a0f0e03daf 100644
--- a/pkgs/applications/emulators/cdemu/base.nix
+++ b/pkgs/applications/emulators/cdemu/base.nix
@@ -1,12 +1,12 @@
 { pname, version, pkgSha256 }:
-{ lib, stdenv, fetchurl, cmake, pkg-config, buildInputs, drvParams ? {} }:
+attrs@{ lib, stdenv, fetchurl, cmake, pkg-config, buildInputs, drvParams ? {}, ... }:
 stdenv.mkDerivation ( rec {
   inherit pname version buildInputs;
   src = fetchurl {
     url = "mirror://sourceforge/cdemu/${pname}-${version}.tar.xz";
     sha256 = pkgSha256;
   };
-  nativeBuildInputs = [ pkg-config cmake ];
+  nativeBuildInputs = (attrs.nativeBuildInputs or [ ]) ++ [ pkg-config cmake ];
   setSourceRoot = ''
     mkdir build
     cd build
diff --git a/pkgs/applications/emulators/cdemu/client.nix b/pkgs/applications/emulators/cdemu/client.nix
index 06604e3eae997..2e301a115c9a2 100644
--- a/pkgs/applications/emulators/cdemu/client.nix
+++ b/pkgs/applications/emulators/cdemu/client.nix
@@ -5,8 +5,8 @@ let pkg = import ./base.nix {
   pkgSha256 = "1prrdhv0ia0axc6b73crszqzh802wlkihz6d100yvg7wbgmqabd7";
 };
 in callPackage pkg {
-  buildInputs = [ python3Packages.python python3Packages.dbus-python python3Packages.pygobject3
-                  intltool makeWrapper ];
+  nativeBuildInputs = [ makeWrapper intltool ];
+  buildInputs = [ python3Packages.python python3Packages.dbus-python python3Packages.pygobject3 ];
   drvParams = {
     postFixup = ''
       wrapProgram $out/bin/cdemu \
diff --git a/pkgs/applications/emulators/cdemu/daemon.nix b/pkgs/applications/emulators/cdemu/daemon.nix
index 3df9e4ad5437f..5d376955ea66d 100644
--- a/pkgs/applications/emulators/cdemu/daemon.nix
+++ b/pkgs/applications/emulators/cdemu/daemon.nix
@@ -5,5 +5,6 @@ let pkg = import ./base.nix {
   pkgSha256 = "16g6fv1lxkdmbsy6zh5sj54dvgwvm900fd18aq609yg8jnqm644d";
 };
 in callPackage pkg {
-  buildInputs = [ glib libao libmirage intltool ];
+  nativeBuildInputs = [ intltool ];
+  buildInputs = [ glib libao libmirage ];
 }
diff --git a/pkgs/applications/emulators/cdemu/gui.nix b/pkgs/applications/emulators/cdemu/gui.nix
index 15e595a617299..3083e1960b5dd 100644
--- a/pkgs/applications/emulators/cdemu/gui.nix
+++ b/pkgs/applications/emulators/cdemu/gui.nix
@@ -8,10 +8,9 @@ let
   };
   inherit (python3Packages) python pygobject3;
 in callPackage pkg {
-  buildInputs = [ python pygobject3 gtk3 glib libnotify intltool makeWrapper
-                  gnome.adwaita-icon-theme gdk-pixbuf librsvg ];
+  buildInputs = [ python pygobject3 gtk3 glib libnotify gnome.adwaita-icon-theme gdk-pixbuf librsvg ];
   drvParams = {
-    nativeBuildInputs = [ gobject-introspection cmake ];
+    nativeBuildInputs = [ gobject-introspection cmake makeWrapper intltool ];
     postFixup = ''
       wrapProgram $out/bin/gcdemu \
         --set PYTHONPATH "$PYTHONPATH" \
diff --git a/pkgs/applications/emulators/cdemu/libmirage.nix b/pkgs/applications/emulators/cdemu/libmirage.nix
index 7016a42d247b5..b631d3669dc9d 100644
--- a/pkgs/applications/emulators/cdemu/libmirage.nix
+++ b/pkgs/applications/emulators/cdemu/libmirage.nix
@@ -8,11 +8,11 @@ let pkg = import ./base.nix {
   pkgSha256 = "0f8i2ha44rykkk3ac2q8zsw3y1zckw6qnf6zvkyrj3qqbzhrf3fm";
 };
 in callPackage pkg {
-  buildInputs = [ glib libsndfile zlib bzip2 xz libsamplerate intltool ];
+  buildInputs = [ glib libsndfile zlib bzip2 xz libsamplerate ];
   drvParams = {
     PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "out"}/share/gir-1.0";
     PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0";
-    nativeBuildInputs = [ cmake gobject-introspection pkg-config ];
+    nativeBuildInputs = [ cmake gobject-introspection pkg-config intltool ];
     propagatedBuildInputs = [ pcre util-linux libselinux libsepol ];
   };
 }