diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2019-02-22 17:49:58 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2019-02-22 17:49:58 +0100 |
commit | 821c0844d499658666901401f2ae088b85cc2e9a (patch) | |
tree | 7fa4ca8db08b3f03b5667928c6817000b7f3b785 /pkgs/misc | |
parent | c9d8f5235bd9201355a7817cab79d38a8bc6e731 (diff) | |
parent | 2adf954e846cc4f6e654c6814a7605cfe53bc003 (diff) | |
download | nixpkgs-821c0844d499658666901401f2ae088b85cc2e9a.tar nixpkgs-821c0844d499658666901401f2ae088b85cc2e9a.tar.gz nixpkgs-821c0844d499658666901401f2ae088b85cc2e9a.tar.bz2 nixpkgs-821c0844d499658666901401f2ae088b85cc2e9a.tar.lz nixpkgs-821c0844d499658666901401f2ae088b85cc2e9a.tar.xz nixpkgs-821c0844d499658666901401f2ae088b85cc2e9a.tar.zst nixpkgs-821c0844d499658666901401f2ae088b85cc2e9a.zip |
Merge branch 'staging' into staging-next
Diffstat (limited to 'pkgs/misc')
-rw-r--r-- | pkgs/misc/emulators/cdemu/analyzer.nix | 2 | ||||
-rw-r--r-- | 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 64b485bea31..87893a93136 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 9403a969e8f..14560919b71 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 \ |