From 2961b83d08a18f6ac9c9d87a347cf5f2cea27690 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Tue, 10 Feb 2015 02:27:04 +0100
Subject: [PATCH 1/7] Add cdemu packages and module

---
 nixos/modules/module-list.nix             |  1 +
 nixos/modules/services/hardware/cdemu.nix | 49 +++++++++++++++++++++++
 pkgs/misc/emulators/cdemu/analyzer.nix    | 15 +++++++
 pkgs/misc/emulators/cdemu/base.nix        | 37 +++++++++++++++++
 pkgs/misc/emulators/cdemu/client.nix      | 15 +++++++
 pkgs/misc/emulators/cdemu/daemon.nix      |  9 +++++
 pkgs/misc/emulators/cdemu/gui.nix         | 18 +++++++++
 pkgs/misc/emulators/cdemu/libmirage.nix   |  9 +++++
 pkgs/misc/emulators/cdemu/vhba.nix        | 12 ++++++
 pkgs/top-level/all-packages.nix           | 10 +++++
 10 files changed, 175 insertions(+)
 create mode 100644 nixos/modules/services/hardware/cdemu.nix
 create mode 100644 pkgs/misc/emulators/cdemu/analyzer.nix
 create mode 100644 pkgs/misc/emulators/cdemu/base.nix
 create mode 100644 pkgs/misc/emulators/cdemu/client.nix
 create mode 100644 pkgs/misc/emulators/cdemu/daemon.nix
 create mode 100644 pkgs/misc/emulators/cdemu/gui.nix
 create mode 100644 pkgs/misc/emulators/cdemu/libmirage.nix
 create mode 100644 pkgs/misc/emulators/cdemu/vhba.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 292feb948828..9c5cb6de83c3 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -144,6 +144,7 @@
   ./services/games/minecraft-server.nix
   ./services/hardware/acpid.nix
   ./services/hardware/amd-hybrid-graphics.nix
+  ./services/hardware/cdemu.nix
   ./services/hardware/bluetooth.nix
   ./services/hardware/freefall.nix
   ./services/hardware/nvidia-optimus.nix
diff --git a/nixos/modules/services/hardware/cdemu.nix b/nixos/modules/services/hardware/cdemu.nix
new file mode 100644
index 000000000000..32a454b39c07
--- /dev/null
+++ b/nixos/modules/services/hardware/cdemu.nix
@@ -0,0 +1,49 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let cfg = config.services.cdemu;
+in {
+
+  options = {
+    services.cdemu = {
+      enable = mkOption {
+        default = false;
+	description = "Whether to enable cdemu for users of appropriate group (default cdrom)";
+      };
+      group = mkOption {
+        default = "cdrom";
+	description = "Required group for users of cdemu";
+      };
+      gui = mkOption {
+        default = true;
+	description = "Whether to install cdemu GUI (gCDEmu)";
+      };
+      image-analyzer = mkOption {
+        default = true;
+	description = "Whether to install image analyzer";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+  
+    boot = {
+      extraModulePackages = [ pkgs.linuxPackages.vhba ];
+      kernelModules = [ "vhba" ];
+    };
+    
+    services = {
+      udev.extraRules = ''
+        KERNEL=="vhba_ctl", MODE="0660", OWNER="root", GROUP="${cfg.group}"
+      '';
+      dbus.packages = [ pkgs.cdemu-daemon ];
+    };
+    
+    environment.systemPackages =
+      [ pkgs.cdemu-daemon pkgs.cdemu-client ]
+      ++ optional cfg.gui pkgs.gcdemu
+      ++ optional cfg.image-analyzer pkgs.image-analyzer;
+  };
+  
+}
diff --git a/pkgs/misc/emulators/cdemu/analyzer.nix b/pkgs/misc/emulators/cdemu/analyzer.nix
new file mode 100644
index 000000000000..30d622ca46fb
--- /dev/null
+++ b/pkgs/misc/emulators/cdemu/analyzer.nix
@@ -0,0 +1,15 @@
+{ callPackage, gtk3, libxml2, gnuplot, makeWrapper, stdenv }:
+let pkg = import ./base.nix {
+  version = "3.0.0";
+  pkgName = "image-analyzer";
+  pkgSha256 = "1rb3f7c08dxc02zrwrkfvq7qlzlmm0kd2ah1fhxj6ajiyshi8q4v";
+};
+in callPackage pkg {
+  buildInputs = [ gtk3 libxml2 gnuplot (callPackage ./libmirage.nix {}) makeWrapper ];
+  drvParams = {
+    postFixup = ''
+      wrapProgram $out/bin/image-analyzer \
+        --set XDG_DATA_DIRS "$out/share:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS"
+    '';
+  };
+}
diff --git a/pkgs/misc/emulators/cdemu/base.nix b/pkgs/misc/emulators/cdemu/base.nix
new file mode 100644
index 000000000000..b2b641e3f7a6
--- /dev/null
+++ b/pkgs/misc/emulators/cdemu/base.nix
@@ -0,0 +1,37 @@
+{ pkgName, version, pkgSha256 }:
+{ stdenv, fetchurl, cmake, pkgconfig, buildInputs, drvParams ? {} }:
+let name = "${pkgName}-${version}";
+in stdenv.mkDerivation ({
+  inherit name buildInputs;
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/cdemu/${name}.tar.bz2";
+    sha256 = pkgSha256;
+  };
+  nativeBuildInputs = [ pkgconfig cmake ];
+  setSourceRoot = ''
+    mkdir build
+    cd build
+    sourceRoot="`pwd`"
+  '';
+  configurePhase = ''
+    cmake ../${name} -DCMAKE_INSTALL_PREFIX=$out -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_RPATH=ON
+  '';
+  meta = {
+    description = "CDemu is a software suite designed to emulate an optical drive and disc (including CD-ROMs and DVD-ROMs) on the Linux operating system.";
+    longDescription = ''
+      CDEmu consists of:
+
+      - a kernel module implementing a virtual drive-controller
+      - libmirage which is a software library for interpreting optical disc images
+      - a daemon which emulates the functionality of an optical drive+disc
+      - textmode and GTK clients for controlling the emulator
+      - an image analyzer to view the structure of image files
+
+      Optical media emulated by CDemu can be mounted within Linux. Automounting is also allowed.
+    '';
+    homepage = "http://cdemu.sourceforge.net/";
+    license = stdenv.lib.licenses.gpl2Plus;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ "Rok Mandeljc <mrok AT users DOT sourceforge DOT net>" ];
+  };
+} // drvParams)
diff --git a/pkgs/misc/emulators/cdemu/client.nix b/pkgs/misc/emulators/cdemu/client.nix
new file mode 100644
index 000000000000..e590cf60ac0d
--- /dev/null
+++ b/pkgs/misc/emulators/cdemu/client.nix
@@ -0,0 +1,15 @@
+{ callPackage, python, dbus_python, intltool, makeWrapper }:
+let pkg = import ./base.nix {
+  version = "3.0.0";
+  pkgName = "cdemu-client";
+  pkgSha256 = "125f6j7c52a0c7smbx323vdpwhx24yl0vglkiyfcbm92fjji14rm";
+};
+in callPackage pkg {
+  buildInputs = [ python dbus_python intltool makeWrapper ];
+  drvParams = {
+    postFixup = ''
+      wrapProgram $out/bin/cdemu \
+        --set PYTHONPATH "$PYTHONPATH"
+    '';
+  };
+}
diff --git a/pkgs/misc/emulators/cdemu/daemon.nix b/pkgs/misc/emulators/cdemu/daemon.nix
new file mode 100644
index 000000000000..cc7a619b14fb
--- /dev/null
+++ b/pkgs/misc/emulators/cdemu/daemon.nix
@@ -0,0 +1,9 @@
+{ callPackage, glib, libao }:
+let pkg = import ./base.nix {
+  version = "3.0.2";
+  pkgName = "cdemu-daemon";
+  pkgSha256 = "01jg9b1nkqrbh6binfcbyraz83s9yjavgwi3y4w1bmqg5qlhv6lc";
+};
+in callPackage pkg {
+  buildInputs = [ glib libao (callPackage ./libmirage.nix {}) ];
+}
diff --git a/pkgs/misc/emulators/cdemu/gui.nix b/pkgs/misc/emulators/cdemu/gui.nix
new file mode 100644
index 000000000000..a6982f13cf50
--- /dev/null
+++ b/pkgs/misc/emulators/cdemu/gui.nix
@@ -0,0 +1,18 @@
+{ callPackage, python, pygobject3, gtk3, glib, libnotify, intltool, makeWrapper, gobjectIntrospection }:
+let pkg = import ./base.nix {
+  version = "3.0.0";
+  pkgName = "gcdemu";
+  pkgSha256 = "1m5ab325r586v2y2d93a817phn6wck67y5mfkf948mph40ks0mqk";
+};
+in callPackage pkg {
+  buildInputs = [ python pygobject3 gtk3 glib libnotify intltool makeWrapper ];
+  drvParams = {
+    postFixup = ''
+      wrapProgram $out/bin/gcdemu \
+        --set PYTHONPATH "$PYTHONPATH" \
+	--set GI_TYPELIB_PATH "$GI_TYPELIB_PATH" \
+	--set XDG_DATA_DIRS "$out/share:$XDG_DATA_DIRS"
+    '';  
+    # TODO AppIndicator
+  };
+}
diff --git a/pkgs/misc/emulators/cdemu/libmirage.nix b/pkgs/misc/emulators/cdemu/libmirage.nix
new file mode 100644
index 000000000000..f6ae5d132fcd
--- /dev/null
+++ b/pkgs/misc/emulators/cdemu/libmirage.nix
@@ -0,0 +1,9 @@
+{ callPackage, glib, libsndfile, zlib, bzip2, lzma, libsamplerate }:
+let pkg = import ./base.nix {
+  version = "3.0.3";
+  pkgName = "libmirage";
+  pkgSha256 = "03idg94h5qhmnnc8g9dw8yqf14yv2paph5n77dfmg925f3z70nyn";
+};
+in callPackage pkg {
+  buildInputs = [ glib libsndfile zlib bzip2 lzma libsamplerate ];
+}
diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/misc/emulators/cdemu/vhba.nix
new file mode 100644
index 000000000000..d4596be03a69
--- /dev/null
+++ b/pkgs/misc/emulators/cdemu/vhba.nix
@@ -0,0 +1,12 @@
+{ stdenv, fetchurl, kernel }:
+let version = "20140928";
+in stdenv.mkDerivation {
+  name = "vhba-${version}";
+  src  = fetchurl {
+    url = "http://downloads.sourceforge.net/cdemu/vhba-module-${version}.tar.bz2";
+    sha256 = "18jmpg2kpx87f32b8aprr1pxla9dlhf901rkj1sp3ammf94nxxa5";
+  };
+  preBuild = ''
+    makeFlags="KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build INSTALL_MOD_PATH=$out";
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6698fe681d88..01d8c9e6092d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -686,6 +686,14 @@ let
 
   catdoc = callPackage ../tools/text/catdoc { };
 
+  cdemu-daemon = callPackage ../misc/emulators/cdemu/daemon.nix { };
+
+  cdemu-client = callPackage ../misc/emulators/cdemu/client.nix { };
+
+  gcdemu = callPackage ../misc/emulators/cdemu/gui.nix { };
+
+  image-analyzer = callPackage ../misc/emulators/cdemu/analyzer.nix { };
+
   ccnet = callPackage ../tools/networking/ccnet { };
 
   cloud-init = callPackage ../tools/virtualization/cloud-init { };
@@ -8798,6 +8806,8 @@ let
 
     v86d = callPackage ../os-specific/linux/v86d { };
 
+    vhba = callPackage ../misc/emulators/cdemu/vhba.nix { };
+
     virtualbox = callPackage ../applications/virtualization/virtualbox {
       stdenv = stdenv_32bit;
       inherit (gnome) libIDL;

From b909def3e17d261df2cf1947eceb43f140113bf2 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Tue, 10 Feb 2015 11:49:32 +0100
Subject: [PATCH 2/7] Whitespace cleanup

---
 nixos/modules/services/hardware/cdemu.nix | 16 ++++++++--------
 pkgs/misc/emulators/cdemu/gui.nix         |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/services/hardware/cdemu.nix b/nixos/modules/services/hardware/cdemu.nix
index 32a454b39c07..bca78f6e8033 100644
--- a/nixos/modules/services/hardware/cdemu.nix
+++ b/nixos/modules/services/hardware/cdemu.nix
@@ -9,41 +9,41 @@ in {
     services.cdemu = {
       enable = mkOption {
         default = false;
-	description = "Whether to enable cdemu for users of appropriate group (default cdrom)";
+        description = "Whether to enable cdemu for users of appropriate group (default cdrom)";
       };
       group = mkOption {
         default = "cdrom";
-	description = "Required group for users of cdemu";
+        description = "Required group for users of cdemu";
       };
       gui = mkOption {
         default = true;
-	description = "Whether to install cdemu GUI (gCDEmu)";
+        description = "Whether to install cdemu GUI (gCDEmu)";
       };
       image-analyzer = mkOption {
         default = true;
-	description = "Whether to install image analyzer";
+        description = "Whether to install image analyzer";
       };
     };
   };
 
   config = mkIf cfg.enable {
-  
+
     boot = {
       extraModulePackages = [ pkgs.linuxPackages.vhba ];
       kernelModules = [ "vhba" ];
     };
-    
+
     services = {
       udev.extraRules = ''
         KERNEL=="vhba_ctl", MODE="0660", OWNER="root", GROUP="${cfg.group}"
       '';
       dbus.packages = [ pkgs.cdemu-daemon ];
     };
-    
+
     environment.systemPackages =
       [ pkgs.cdemu-daemon pkgs.cdemu-client ]
       ++ optional cfg.gui pkgs.gcdemu
       ++ optional cfg.image-analyzer pkgs.image-analyzer;
   };
-  
+
 }
diff --git a/pkgs/misc/emulators/cdemu/gui.nix b/pkgs/misc/emulators/cdemu/gui.nix
index a6982f13cf50..44c128e8c209 100644
--- a/pkgs/misc/emulators/cdemu/gui.nix
+++ b/pkgs/misc/emulators/cdemu/gui.nix
@@ -10,9 +10,9 @@ in callPackage pkg {
     postFixup = ''
       wrapProgram $out/bin/gcdemu \
         --set PYTHONPATH "$PYTHONPATH" \
-	--set GI_TYPELIB_PATH "$GI_TYPELIB_PATH" \
-	--set XDG_DATA_DIRS "$out/share:$XDG_DATA_DIRS"
-    '';  
+        --set GI_TYPELIB_PATH "$GI_TYPELIB_PATH" \
+        --set XDG_DATA_DIRS "$out/share:$XDG_DATA_DIRS"
+    '';
     # TODO AppIndicator
   };
 }

From 983fddcea892485949923f6e0c947d2bee6ba09c Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Tue, 10 Feb 2015 11:52:46 +0100
Subject: [PATCH 3/7] Move cdemu module into programs

---
 nixos/modules/module-list.nix                           | 2 +-
 nixos/modules/{services/hardware => programs}/cdemu.nix | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename nixos/modules/{services/hardware => programs}/cdemu.nix (95%)

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 9c5cb6de83c3..244d1b25f52d 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -55,6 +55,7 @@
   ./programs/atop.nix
   ./programs/bash/bash.nix
   ./programs/blcr.nix
+  ./programs/cdemu.nix
   ./programs/command-not-found/command-not-found.nix
   ./programs/dconf.nix
   ./programs/environment.nix
@@ -144,7 +145,6 @@
   ./services/games/minecraft-server.nix
   ./services/hardware/acpid.nix
   ./services/hardware/amd-hybrid-graphics.nix
-  ./services/hardware/cdemu.nix
   ./services/hardware/bluetooth.nix
   ./services/hardware/freefall.nix
   ./services/hardware/nvidia-optimus.nix
diff --git a/nixos/modules/services/hardware/cdemu.nix b/nixos/modules/programs/cdemu.nix
similarity index 95%
rename from nixos/modules/services/hardware/cdemu.nix
rename to nixos/modules/programs/cdemu.nix
index bca78f6e8033..d1b1915eea91 100644
--- a/nixos/modules/services/hardware/cdemu.nix
+++ b/nixos/modules/programs/cdemu.nix
@@ -2,11 +2,11 @@
 
 with lib;
 
-let cfg = config.services.cdemu;
+let cfg = config.programs.cdemu;
 in {
 
   options = {
-    services.cdemu = {
+    programs.cdemu = {
       enable = mkOption {
         default = false;
         description = "Whether to enable cdemu for users of appropriate group (default cdrom)";

From 67f9c8b0254569db56eba0c7069975d1a36fd5a7 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Tue, 10 Feb 2015 13:14:25 +0100
Subject: [PATCH 4/7] Fix cdemu ui gsettings schema paths

---
 pkgs/misc/emulators/cdemu/analyzer.nix | 6 +++---
 pkgs/misc/emulators/cdemu/gui.nix      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/emulators/cdemu/analyzer.nix b/pkgs/misc/emulators/cdemu/analyzer.nix
index 30d622ca46fb..5962102d58bc 100644
--- a/pkgs/misc/emulators/cdemu/analyzer.nix
+++ b/pkgs/misc/emulators/cdemu/analyzer.nix
@@ -1,15 +1,15 @@
-{ callPackage, gtk3, libxml2, gnuplot, makeWrapper, stdenv }:
+{ callPackage, gtk3, glib, libxml2, gnuplot, makeWrapper, stdenv }:
 let pkg = import ./base.nix {
   version = "3.0.0";
   pkgName = "image-analyzer";
   pkgSha256 = "1rb3f7c08dxc02zrwrkfvq7qlzlmm0kd2ah1fhxj6ajiyshi8q4v";
 };
 in callPackage pkg {
-  buildInputs = [ gtk3 libxml2 gnuplot (callPackage ./libmirage.nix {}) makeWrapper ];
+  buildInputs = [ glib gtk3 libxml2 gnuplot (callPackage ./libmirage.nix {}) makeWrapper ];
   drvParams = {
     postFixup = ''
       wrapProgram $out/bin/image-analyzer \
-        --set XDG_DATA_DIRS "$out/share:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS"
+        --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH:$XDG_DATA_DIRS"
     '';
   };
 }
diff --git a/pkgs/misc/emulators/cdemu/gui.nix b/pkgs/misc/emulators/cdemu/gui.nix
index 44c128e8c209..825c82d8de20 100644
--- a/pkgs/misc/emulators/cdemu/gui.nix
+++ b/pkgs/misc/emulators/cdemu/gui.nix
@@ -11,7 +11,7 @@ in callPackage pkg {
       wrapProgram $out/bin/gcdemu \
         --set PYTHONPATH "$PYTHONPATH" \
         --set GI_TYPELIB_PATH "$GI_TYPELIB_PATH" \
-        --set XDG_DATA_DIRS "$out/share:$XDG_DATA_DIRS"
+        --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH:$XDG_DATA_DIRS"
     '';
     # TODO AppIndicator
   };

From eb03122cf6f2d0bb5db86458c31cf052f9da9d04 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Tue, 10 Feb 2015 14:09:27 +0100
Subject: [PATCH 5/7] Use gnome3 icon theme in cdemu

---
 pkgs/misc/emulators/cdemu/analyzer.nix | 4 ++--
 pkgs/misc/emulators/cdemu/gui.nix      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/emulators/cdemu/analyzer.nix b/pkgs/misc/emulators/cdemu/analyzer.nix
index 5962102d58bc..cedd47ea6376 100644
--- a/pkgs/misc/emulators/cdemu/analyzer.nix
+++ b/pkgs/misc/emulators/cdemu/analyzer.nix
@@ -1,11 +1,11 @@
-{ callPackage, gtk3, glib, libxml2, gnuplot, makeWrapper, stdenv }:
+{ callPackage, gtk3, glib, libxml2, gnuplot, makeWrapper, stdenv, gnome3 }:
 let pkg = import ./base.nix {
   version = "3.0.0";
   pkgName = "image-analyzer";
   pkgSha256 = "1rb3f7c08dxc02zrwrkfvq7qlzlmm0kd2ah1fhxj6ajiyshi8q4v";
 };
 in callPackage pkg {
-  buildInputs = [ glib gtk3 libxml2 gnuplot (callPackage ./libmirage.nix {}) makeWrapper ];
+  buildInputs = [ glib gtk3 libxml2 gnuplot (callPackage ./libmirage.nix {}) makeWrapper gnome3.gnome_icon_theme_symbolic ];
   drvParams = {
     postFixup = ''
       wrapProgram $out/bin/image-analyzer \
diff --git a/pkgs/misc/emulators/cdemu/gui.nix b/pkgs/misc/emulators/cdemu/gui.nix
index 825c82d8de20..93efd9bf1b51 100644
--- a/pkgs/misc/emulators/cdemu/gui.nix
+++ b/pkgs/misc/emulators/cdemu/gui.nix
@@ -1,11 +1,11 @@
-{ callPackage, python, pygobject3, gtk3, glib, libnotify, intltool, makeWrapper, gobjectIntrospection }:
+{ callPackage, python, pygobject3, gtk3, glib, libnotify, intltool, makeWrapper, gobjectIntrospection, gnome3 }:
 let pkg = import ./base.nix {
   version = "3.0.0";
   pkgName = "gcdemu";
   pkgSha256 = "1m5ab325r586v2y2d93a817phn6wck67y5mfkf948mph40ks0mqk";
 };
 in callPackage pkg {
-  buildInputs = [ python pygobject3 gtk3 glib libnotify intltool makeWrapper ];
+  buildInputs = [ python pygobject3 gtk3 glib libnotify intltool makeWrapper gnome3.gnome_icon_theme_symbolic ];
   drvParams = {
     postFixup = ''
       wrapProgram $out/bin/gcdemu \

From 7d24bcdbcf0c1c018900235ba8e97fe901892156 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Tue, 10 Feb 2015 14:25:23 +0100
Subject: [PATCH 6/7] Add gdk_pixbuf, gnome_icon_theme and librsvg to cdemu gui
 programs

---
 pkgs/misc/emulators/cdemu/analyzer.nix | 4 ++--
 pkgs/misc/emulators/cdemu/gui.nix      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/emulators/cdemu/analyzer.nix b/pkgs/misc/emulators/cdemu/analyzer.nix
index cedd47ea6376..807f9c44204d 100644
--- a/pkgs/misc/emulators/cdemu/analyzer.nix
+++ b/pkgs/misc/emulators/cdemu/analyzer.nix
@@ -1,11 +1,11 @@
-{ callPackage, gtk3, glib, libxml2, gnuplot, makeWrapper, stdenv, gnome3 }:
+{ callPackage, gtk3, glib, libxml2, gnuplot, makeWrapper, stdenv, gnome3, gdk_pixbuf, librsvg }:
 let pkg = import ./base.nix {
   version = "3.0.0";
   pkgName = "image-analyzer";
   pkgSha256 = "1rb3f7c08dxc02zrwrkfvq7qlzlmm0kd2ah1fhxj6ajiyshi8q4v";
 };
 in callPackage pkg {
-  buildInputs = [ glib gtk3 libxml2 gnuplot (callPackage ./libmirage.nix {}) makeWrapper gnome3.gnome_icon_theme_symbolic ];
+  buildInputs = [ glib gtk3 libxml2 gnuplot (callPackage ./libmirage.nix {}) makeWrapper gnome3.gnome_icon_theme_symbolic gnome3.gnome_icon_theme gdk_pixbuf librsvg ];
   drvParams = {
     postFixup = ''
       wrapProgram $out/bin/image-analyzer \
diff --git a/pkgs/misc/emulators/cdemu/gui.nix b/pkgs/misc/emulators/cdemu/gui.nix
index 93efd9bf1b51..ab54abd68254 100644
--- a/pkgs/misc/emulators/cdemu/gui.nix
+++ b/pkgs/misc/emulators/cdemu/gui.nix
@@ -1,11 +1,11 @@
-{ callPackage, python, pygobject3, gtk3, glib, libnotify, intltool, makeWrapper, gobjectIntrospection, gnome3 }:
+{ callPackage, python, pygobject3, gtk3, glib, libnotify, intltool, makeWrapper, gobjectIntrospection, gnome3, gdk_pixbuf, librsvg }:
 let pkg = import ./base.nix {
   version = "3.0.0";
   pkgName = "gcdemu";
   pkgSha256 = "1m5ab325r586v2y2d93a817phn6wck67y5mfkf948mph40ks0mqk";
 };
 in callPackage pkg {
-  buildInputs = [ python pygobject3 gtk3 glib libnotify intltool makeWrapper gnome3.gnome_icon_theme_symbolic ];
+  buildInputs = [ python pygobject3 gtk3 glib libnotify intltool makeWrapper gnome3.gnome_icon_theme_symbolic gnome3.gnome_icon_theme gdk_pixbuf librsvg ];
   drvParams = {
     postFixup = ''
       wrapProgram $out/bin/gcdemu \

From dea3ac7783568482e3a18a1b4603702fdcff1dd9 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Tue, 10 Feb 2015 14:44:29 +0100
Subject: [PATCH 7/7] Use XDG_ICON_DIRS in cdemu's XDG_DATA_DIRS

---
 pkgs/misc/emulators/cdemu/analyzer.nix | 2 +-
 pkgs/misc/emulators/cdemu/gui.nix      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/emulators/cdemu/analyzer.nix b/pkgs/misc/emulators/cdemu/analyzer.nix
index 807f9c44204d..6126108b642d 100644
--- a/pkgs/misc/emulators/cdemu/analyzer.nix
+++ b/pkgs/misc/emulators/cdemu/analyzer.nix
@@ -9,7 +9,7 @@ in callPackage pkg {
   drvParams = {
     postFixup = ''
       wrapProgram $out/bin/image-analyzer \
-        --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH:$XDG_DATA_DIRS"
+        --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
     '';
   };
 }
diff --git a/pkgs/misc/emulators/cdemu/gui.nix b/pkgs/misc/emulators/cdemu/gui.nix
index ab54abd68254..b3d7f6d23ec7 100644
--- a/pkgs/misc/emulators/cdemu/gui.nix
+++ b/pkgs/misc/emulators/cdemu/gui.nix
@@ -11,7 +11,7 @@ in callPackage pkg {
       wrapProgram $out/bin/gcdemu \
         --set PYTHONPATH "$PYTHONPATH" \
         --set GI_TYPELIB_PATH "$GI_TYPELIB_PATH" \
-        --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH:$XDG_DATA_DIRS"
+        --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
     '';
     # TODO AppIndicator
   };