about summary refs log tree commit diff
path: root/pkgs/misc/emulators
diff options
context:
space:
mode:
authorFrederik Rietdijk <freddyrietdijk@fridh.nl>2019-03-01 09:06:20 +0100
committerFrederik Rietdijk <freddyrietdijk@fridh.nl>2019-03-01 09:06:20 +0100
commit2fcb11a2442b27834db87b2f62511037c31b5e36 (patch)
treee9d38370aac7632cd35207180dc7c87d2bb6171d /pkgs/misc/emulators
parent456ff62ff820bbb2debd4568a775d88e61fd8bd1 (diff)
parentfc4a8f63c4e46652d484b127162641be36481363 (diff)
downloadnixlib-2fcb11a2442b27834db87b2f62511037c31b5e36.tar
nixlib-2fcb11a2442b27834db87b2f62511037c31b5e36.tar.gz
nixlib-2fcb11a2442b27834db87b2f62511037c31b5e36.tar.bz2
nixlib-2fcb11a2442b27834db87b2f62511037c31b5e36.tar.lz
nixlib-2fcb11a2442b27834db87b2f62511037c31b5e36.tar.xz
nixlib-2fcb11a2442b27834db87b2f62511037c31b5e36.tar.zst
nixlib-2fcb11a2442b27834db87b2f62511037c31b5e36.zip
Merge staging-next into master
Diffstat (limited to 'pkgs/misc/emulators')
-rw-r--r--pkgs/misc/emulators/cdemu/analyzer.nix2
-rw-r--r--pkgs/misc/emulators/cdemu/gui.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/misc/emulators/cdemu/analyzer.nix b/pkgs/misc/emulators/cdemu/analyzer.nix
index 64b485bea310..87893a931363 100644
--- a/pkgs/misc/emulators/cdemu/analyzer.nix
+++ b/pkgs/misc/emulators/cdemu/analyzer.nix
@@ -6,7 +6,7 @@ let pkg = import ./base.nix {
 };
 in callPackage pkg {
   buildInputs = [ glib gtk3 libxml2 gnuplot (callPackage ./libmirage.nix {}) makeWrapper
-                  gnome3.defaultIconTheme gdk_pixbuf librsvg intltool ];
+                  gnome3.adwaita-icon-theme gdk_pixbuf librsvg intltool ];
   drvParams = {
     postFixup = ''
       wrapProgram $out/bin/image-analyzer \
diff --git a/pkgs/misc/emulators/cdemu/gui.nix b/pkgs/misc/emulators/cdemu/gui.nix
index 9403a969e8f4..14560919b71a 100644
--- a/pkgs/misc/emulators/cdemu/gui.nix
+++ b/pkgs/misc/emulators/cdemu/gui.nix
@@ -8,7 +8,7 @@ let
   inherit (pythonPackages) python pygobject3;
 in callPackage pkg {
   buildInputs = [ python pygobject3 gtk3 glib libnotify intltool makeWrapper
-                  gnome3.defaultIconTheme gdk_pixbuf librsvg ];
+                  gnome3.adwaita-icon-theme gdk_pixbuf librsvg ];
   drvParams = {
     postFixup = ''
       wrapProgram $out/bin/gcdemu \