4 files changed, 31 insertions, 49 deletions
diff --git a/pkgs/misc/drivers/foo2zjs/default.nix b/pkgs/misc/drivers/foo2zjs/default.nix
index 2547baec4f1..61903cacfca 100644
--- a/pkgs/misc/drivers/foo2zjs/default.nix
+++ b/pkgs/misc/drivers/foo2zjs/default.nix
@@ -1,51 +1,33 @@
-x@{builderDefsPackage
-  , foomatic_filters, bc, unzip, ghostscript, systemd, vim
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{ stdenv, fetchurl, foomatic_filters, bc, unzip, ghostscript, systemd, vim }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="foo2zjs";
-    version="20110210";
-    name="${baseName}-${version}";
-    url="http://www.loegria.net/mirrors/foo2zjs/${name}.tar.gz";
-    hash="0vss8gdbbgxr694xw48rys2qflbnb4sp4gdb1v6z4m9ab97hs5yk";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
-  };
+stdenv.mkDerivation rec {
+  name = "foo2zjs-20110210";
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  src = fetchurl {
+    url = "http://www.loegria.net/mirrors/foo2zjs/${name}.tar.gz";
+    sha256 = "0vss8gdbbgxr694xw48rys2qflbnb4sp4gdb1v6z4m9ab97hs5yk";
+  };
 
-  phaseNames = ["doPatch" "fixHardcodedPaths" "doMakeDirs" "doMakeInstall" "deployGetWeb"];
+  buildInputs = [ foomatic_filters bc unzip ghostscript systemd vim ];
 
   patches = [ ./no-hardcode-fw.diff ];
 
   makeFlags = [
-      ''PREFIX=$out''
-      ''APPL=$out/share/applications''
-      ''PIXMAPS=$out/share/pixmaps''
-      ''UDEVBIN=$out/bin''
-      ''UDEVDIR=$out/etc/udev/rules.d''
-      ''UDEVD=${systemd.udev.bin}/sbin/udevd''
-      ''LIBUDEVDIR=$out/lib/udev/rules.d''
-      ''USBDIR=$out/etc/hotplug/usb''
-      ''FOODB=$out/share/foomatic/db/source''
-      ''MODEL=$out/share/cups/model''
+    "PREFIX=$(out)"
+    "APPL=$(out)/share/applications"
+    "PIXMAPS=$(out)/share/pixmaps"
+    "UDEVBIN=$(out)/bin"
+    "UDEVDIR=$(out)/etc/udev/rules.d"
+    "UDEVD=${systemd.udev.bin}/sbin/udevd"
+    "LIBUDEVDIR=$(out)/lib/udev/rules.d"
+    "USBDIR=$(out)/etc/hotplug/usb"
+    "FOODB=$(out)/share/foomatic/db/source"
+    "MODEL=$(out)/share/cups/model"
   ];
 
   installFlags = [ "install-hotplug" ];
 
-  fixHardcodedPaths = a.fullDepEntry ''
+  postPatch = ''
     touch all-test
     sed -e "/BASENAME=/iPATH=$out/bin:$PATH" -i *-wrapper *-wrapper.in
     sed -e "s@PREFIX=/usr@PREFIX=$out@" -i *-wrapper{,.in}
@@ -55,28 +37,25 @@ rec {
     sed -e "s@/etc/hotplug/usb@$out&@" -i *rules*
     sed -e "s@/usr@$out@g" -i hplj1020.desktop
     sed -e "/PRINTERID=/s@=.*@=$out/bin/usb_printerid@" -i hplj1000
-  '' ["doPatch" "minInit"];
+  '';
 
-  doMakeDirs = a.fullDepEntry ''
+  preInstall = ''
     mkdir -pv $out/{etc/udev/rules.d,lib/udev/rules.d,etc/hotplug/usb}
     mkdir -pv $out/share/foomatic/db/source/{opt,printer,driver}
     mkdir -pv $out/share/cups/model
     mkdir -pv $out/share/{applications,pixmaps}
-  '' ["minInit"];
 
-  deployGetWeb = a.fullDepEntry ''
     mkdir -pv "$out/bin"
     cp -v getweb arm2hpdl "$out/bin"
-  '' ["minInit"];
-      
-  meta = {
+  '';
+
+  meta = with stdenv.lib; {
     description = "ZjStream printer drivers";
-    maintainers = with a.lib.maintainers;
+    maintainers = with maintainers;
     [
       raskin urkud
     ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = a.lib.licenses.gpl2Plus;
+    platforms = platforms.linux;
+    license = licenses.gpl2Plus;
   };
-}) x
+}
diff --git a/pkgs/misc/drivers/gutenprint/bin.nix b/pkgs/misc/drivers/gutenprint/bin.nix
index b5ab61edb95..ac3e96e2658 100644
--- a/pkgs/misc/drivers/gutenprint/bin.nix
+++ b/pkgs/misc/drivers/gutenprint/bin.nix
@@ -63,5 +63,6 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Some additional CUPS drivers including Canon drivers";
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/misc/drivers/moltengamepad/default.nix b/pkgs/misc/drivers/moltengamepad/default.nix
index 7cf70cf9555..61d7810c2d4 100644
--- a/pkgs/misc/drivers/moltengamepad/default.nix
+++ b/pkgs/misc/drivers/moltengamepad/default.nix
@@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
     description = "Flexible Linux input device translator, geared for gamepads";
     license = licenses.mit;
     maintainers = [ maintainers.ebzzry ];
+    platforms = platforms.linux;
   };
 
 }
diff --git a/pkgs/misc/drivers/xboxdrv/default.nix b/pkgs/misc/drivers/xboxdrv/default.nix
index a6f99cca8cc..4e0b609fdb0 100644
--- a/pkgs/misc/drivers/xboxdrv/default.nix
+++ b/pkgs/misc/drivers/xboxdrv/default.nix
@@ -22,6 +22,7 @@ in stdenv.mkDerivation {
     description = "Xbox/Xbox360 (and more) gamepad driver for Linux that works in userspace";
     license = licenses.gpl3Plus;
     maintainers = [ maintainers.fuuzetsu ];
+    platforms = platforms.linux;
   };
 
 }