diff options
author | Herwig Hochleitner <herwig@bendlas.net> | 2019-04-04 19:12:14 +0200 |
---|---|---|
committer | Herwig Hochleitner <herwig@bendlas.net> | 2019-04-05 15:48:34 +0200 |
commit | 79d653be55eed75294d8644e5d1fb0f4e6024387 (patch) | |
tree | 2109d294a056522dba3cf5e9b97e81cb5395a1ab | |
parent | 794e864a073dd90b113449f9f66b4e9a8e5b6c89 (diff) | |
download | nixpkgs-79d653be55eed75294d8644e5d1fb0f4e6024387.tar nixpkgs-79d653be55eed75294d8644e5d1fb0f4e6024387.tar.gz nixpkgs-79d653be55eed75294d8644e5d1fb0f4e6024387.tar.bz2 nixpkgs-79d653be55eed75294d8644e5d1fb0f4e6024387.tar.lz nixpkgs-79d653be55eed75294d8644e5d1fb0f4e6024387.tar.xz nixpkgs-79d653be55eed75294d8644e5d1fb0f4e6024387.tar.zst nixpkgs-79d653be55eed75294d8644e5d1fb0f4e6024387.zip |
cdemu: update to 3.2 release
closes https://github.com/NixOS/nixpkgs/pull/58911
-rw-r--r-- | pkgs/misc/emulators/cdemu/analyzer.nix | 15 | ||||
-rw-r--r-- | pkgs/misc/emulators/cdemu/client.nix | 8 | ||||
-rw-r--r-- | pkgs/misc/emulators/cdemu/daemon.nix | 8 | ||||
-rw-r--r-- | pkgs/misc/emulators/cdemu/gui.nix | 10 | ||||
-rw-r--r-- | pkgs/misc/emulators/cdemu/libmirage.nix | 15 |
5 files changed, 36 insertions, 20 deletions
diff --git a/pkgs/misc/emulators/cdemu/analyzer.nix b/pkgs/misc/emulators/cdemu/analyzer.nix index 87893a93136..a57fda56ddd 100644 --- a/pkgs/misc/emulators/cdemu/analyzer.nix +++ b/pkgs/misc/emulators/cdemu/analyzer.nix @@ -1,15 +1,20 @@ -{ callPackage, gtk3, glib, libxml2, gnuplot, makeWrapper, gnome3, gdk_pixbuf, librsvg, intltool }: +{ callPackage, makeWrapper, gobject-introspection, cmake +, python3Packages, gtk3, glib, libxml2, gnuplot, gnome3, gdk_pixbuf, librsvg, intltool, libmirage }: let pkg = import ./base.nix { - version = "3.1.0"; + version = "3.2.2"; pkgName = "image-analyzer"; - pkgSha256 = "1pr23kxx83xp83h27fkdv86f3bxclkx056f9jx8jhnpn113xp7r2"; + pkgSha256 = "0by3nd5c413cvk3jmv3md6q0axbiidy061g9dhf37qzwgcakcx8j"; }; in callPackage pkg { - buildInputs = [ glib gtk3 libxml2 gnuplot (callPackage ./libmirage.nix {}) makeWrapper - gnome3.adwaita-icon-theme gdk_pixbuf librsvg intltool ]; + buildInputs = [ glib gtk3 libxml2 gnuplot libmirage makeWrapper + gnome3.adwaita-icon-theme gdk_pixbuf librsvg intltool + python3Packages.python python3Packages.pygobject3 python3Packages.matplotlib ]; drvParams = { + nativeBuildInputs = [ gobject-introspection cmake ]; postFixup = '' wrapProgram $out/bin/image-analyzer \ + --set PYTHONPATH "$PYTHONPATH" \ + --set GI_TYPELIB_PATH "$GI_TYPELIB_PATH" \ --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" ''; }; diff --git a/pkgs/misc/emulators/cdemu/client.nix b/pkgs/misc/emulators/cdemu/client.nix index ec4341a2945..dbf471d35d1 100644 --- a/pkgs/misc/emulators/cdemu/client.nix +++ b/pkgs/misc/emulators/cdemu/client.nix @@ -1,11 +1,11 @@ -{ callPackage, pythonPackages, intltool, makeWrapper }: +{ callPackage, python3Packages, intltool, makeWrapper }: let pkg = import ./base.nix { - version = "3.1.0"; + version = "3.2.1"; pkgName = "cdemu-client"; - pkgSha256 = "0s6q923g5vkahw5fki6c7a25f68y78zfx4pfsy0xww0z1f5hfsik"; + pkgSha256 = "1d8m24qvv62xcwafw5zs4yf39vs64kxl4idqcngd8yyjhrb2ykg5"; }; in callPackage pkg { - buildInputs = [ pythonPackages.python pythonPackages.dbus-python pythonPackages.pygobject3 + buildInputs = [ python3Packages.python python3Packages.dbus-python python3Packages.pygobject3 intltool makeWrapper ]; drvParams = { postFixup = '' diff --git a/pkgs/misc/emulators/cdemu/daemon.nix b/pkgs/misc/emulators/cdemu/daemon.nix index 587224e71d7..a80327ce91c 100644 --- a/pkgs/misc/emulators/cdemu/daemon.nix +++ b/pkgs/misc/emulators/cdemu/daemon.nix @@ -1,9 +1,9 @@ -{ callPackage, glib, libao, intltool }: +{ callPackage, glib, libao, intltool, libmirage }: let pkg = import ./base.nix { - version = "3.1.0"; + version = "3.2.2"; pkgName = "cdemu-daemon"; - pkgSha256 = "0kxwhwjvcr40sjlrvln9gasjwkkfc3wxpcz0rxmffp92w8phz3s9"; + pkgSha256 = "0himyrhhfjsr4ff5aci7240bpm9x34h20pid412ci8fm16nk929b"; }; in callPackage pkg { - buildInputs = [ glib libao (callPackage ./libmirage.nix {}) intltool ]; + buildInputs = [ glib libao libmirage intltool ]; } diff --git a/pkgs/misc/emulators/cdemu/gui.nix b/pkgs/misc/emulators/cdemu/gui.nix index 14560919b71..331ad0ded24 100644 --- a/pkgs/misc/emulators/cdemu/gui.nix +++ b/pkgs/misc/emulators/cdemu/gui.nix @@ -1,15 +1,17 @@ -{ callPackage, pythonPackages, gtk3, glib, libnotify, intltool, makeWrapper, gnome3, gdk_pixbuf, librsvg }: +{ callPackage, makeWrapper, gobject-introspection, cmake +, python3Packages, gtk3, glib, libnotify, intltool, gnome3, gdk_pixbuf, librsvg }: let pkg = import ./base.nix { - version = "3.1.0"; + version = "3.2.1"; pkgName = "gcdemu"; - pkgSha256 = "0rmnw302fk9vli22v54qx19lqxy23syxi154klxz2vma009q0p02"; + pkgSha256 = "0lmyvhbf57wcm8k2a33j2dhy4gblaiycy33q070gdrxi37xk7w5g"; }; - inherit (pythonPackages) python pygobject3; + inherit (python3Packages) python pygobject3; in callPackage pkg { buildInputs = [ python pygobject3 gtk3 glib libnotify intltool makeWrapper gnome3.adwaita-icon-theme gdk_pixbuf librsvg ]; drvParams = { + nativeBuildInputs = [ gobject-introspection cmake ]; postFixup = '' wrapProgram $out/bin/gcdemu \ --set PYTHONPATH "$PYTHONPATH" \ diff --git a/pkgs/misc/emulators/cdemu/libmirage.nix b/pkgs/misc/emulators/cdemu/libmirage.nix index 3813ceef611..0ead78305cd 100644 --- a/pkgs/misc/emulators/cdemu/libmirage.nix +++ b/pkgs/misc/emulators/cdemu/libmirage.nix @@ -1,9 +1,18 @@ -{ callPackage, glib, libsndfile, zlib, bzip2, lzma, libsamplerate, intltool }: +{ callPackage, gobject-introspection, cmake, pkgconfig +, glib, libsndfile, zlib, bzip2, lzma, libsamplerate, intltool +, pcre, utillinux, libselinux, libsepol }: + let pkg = import ./base.nix { - version = "3.1.0"; + version = "3.2.2"; pkgName = "libmirage"; - pkgSha256 = "0qvkvnvxqx8hqzcqzh7sqjzgbc1nrd91lzv33lr8c6fgaq8cqzmn"; + pkgSha256 = "0gwrfia0fyhi0b3p2pfyyvrcfcb0qysfzgpdqsqjqbx4xaqx5wpi"; }; in callPackage pkg { buildInputs = [ glib libsndfile zlib bzip2 lzma libsamplerate intltool ]; + drvParams = { + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "out"}/share/gir-1.0"; + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0"; + nativeBuildInputs = [ cmake gobject-introspection pkgconfig ]; + propagatedBuildInputs = [ pcre utillinux libselinux libsepol ]; + }; } |