diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-08-14 00:20:49 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-08-14 00:23:16 +0000 |
commit | 4999a38db7c5de0ea9f514a12ecd4133cce647f3 (patch) | |
tree | bbb659ab07fda4c9b98053499b7e3f046ac6d5dc /nixpkgs/pkgs/misc/emulators/cdemu | |
parent | f9abd30e11337cf07034f2cc8ad1691aa4a69386 (diff) | |
parent | 8746c77a383f5c76153c7a181f3616d273acfa2a (diff) | |
download | nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.tar nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.tar.gz nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.tar.bz2 nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.tar.lz nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.tar.xz nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.tar.zst nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.zip |
Merge commit '8746c77a383f5c76153c7a181f3616d273acfa2a'
Diffstat (limited to 'nixpkgs/pkgs/misc/emulators/cdemu')
-rw-r--r-- | nixpkgs/pkgs/misc/emulators/cdemu/analyzer.nix | 4 | ||||
-rw-r--r-- | nixpkgs/pkgs/misc/emulators/cdemu/gui.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/misc/emulators/cdemu/analyzer.nix b/nixpkgs/pkgs/misc/emulators/cdemu/analyzer.nix index a57fda56ddd4..e52cf7efc6b5 100644 --- a/nixpkgs/pkgs/misc/emulators/cdemu/analyzer.nix +++ b/nixpkgs/pkgs/misc/emulators/cdemu/analyzer.nix @@ -1,5 +1,5 @@ { callPackage, makeWrapper, gobject-introspection, cmake -, python3Packages, gtk3, glib, libxml2, gnuplot, gnome3, gdk_pixbuf, librsvg, intltool, libmirage }: +, python3Packages, gtk3, glib, libxml2, gnuplot, gnome3, gdk-pixbuf, librsvg, intltool, libmirage }: let pkg = import ./base.nix { version = "3.2.2"; pkgName = "image-analyzer"; @@ -7,7 +7,7 @@ let pkg = import ./base.nix { }; in callPackage pkg { buildInputs = [ glib gtk3 libxml2 gnuplot libmirage makeWrapper - gnome3.adwaita-icon-theme gdk_pixbuf librsvg intltool + gnome3.adwaita-icon-theme gdk-pixbuf librsvg intltool python3Packages.python python3Packages.pygobject3 python3Packages.matplotlib ]; drvParams = { nativeBuildInputs = [ gobject-introspection cmake ]; diff --git a/nixpkgs/pkgs/misc/emulators/cdemu/gui.nix b/nixpkgs/pkgs/misc/emulators/cdemu/gui.nix index 331ad0ded248..e06853b8f736 100644 --- a/nixpkgs/pkgs/misc/emulators/cdemu/gui.nix +++ b/nixpkgs/pkgs/misc/emulators/cdemu/gui.nix @@ -1,5 +1,5 @@ { callPackage, makeWrapper, gobject-introspection, cmake -, python3Packages, gtk3, glib, libnotify, intltool, gnome3, gdk_pixbuf, librsvg }: +, python3Packages, gtk3, glib, libnotify, intltool, gnome3, gdk-pixbuf, librsvg }: let pkg = import ./base.nix { version = "3.2.1"; @@ -9,7 +9,7 @@ let inherit (python3Packages) python pygobject3; in callPackage pkg { buildInputs = [ python pygobject3 gtk3 glib libnotify intltool makeWrapper - gnome3.adwaita-icon-theme gdk_pixbuf librsvg ]; + gnome3.adwaita-icon-theme gdk-pixbuf librsvg ]; drvParams = { nativeBuildInputs = [ gobject-introspection cmake ]; postFixup = '' |