cdemu: update to 3.2 release

closes https://github.com/NixOS/nixpkgs/pull/58911
This commit is contained in:
Herwig Hochleitner 2019-04-04 19:12:14 +02:00
parent 794e864a07
commit 79d653be55
5 changed files with 36 additions and 20 deletions

View file

@ -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 { let pkg = import ./base.nix {
version = "3.1.0"; version = "3.2.2";
pkgName = "image-analyzer"; pkgName = "image-analyzer";
pkgSha256 = "1pr23kxx83xp83h27fkdv86f3bxclkx056f9jx8jhnpn113xp7r2"; pkgSha256 = "0by3nd5c413cvk3jmv3md6q0axbiidy061g9dhf37qzwgcakcx8j";
}; };
in callPackage pkg { in callPackage pkg {
buildInputs = [ glib gtk3 libxml2 gnuplot (callPackage ./libmirage.nix {}) makeWrapper 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 = { drvParams = {
nativeBuildInputs = [ gobject-introspection cmake ];
postFixup = '' postFixup = ''
wrapProgram $out/bin/image-analyzer \ 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" --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
''; '';
}; };

View file

@ -1,11 +1,11 @@
{ callPackage, pythonPackages, intltool, makeWrapper }: { callPackage, python3Packages, intltool, makeWrapper }:
let pkg = import ./base.nix { let pkg = import ./base.nix {
version = "3.1.0"; version = "3.2.1";
pkgName = "cdemu-client"; pkgName = "cdemu-client";
pkgSha256 = "0s6q923g5vkahw5fki6c7a25f68y78zfx4pfsy0xww0z1f5hfsik"; pkgSha256 = "1d8m24qvv62xcwafw5zs4yf39vs64kxl4idqcngd8yyjhrb2ykg5";
}; };
in callPackage pkg { in callPackage pkg {
buildInputs = [ pythonPackages.python pythonPackages.dbus-python pythonPackages.pygobject3 buildInputs = [ python3Packages.python python3Packages.dbus-python python3Packages.pygobject3
intltool makeWrapper ]; intltool makeWrapper ];
drvParams = { drvParams = {
postFixup = '' postFixup = ''

View file

@ -1,9 +1,9 @@
{ callPackage, glib, libao, intltool }: { callPackage, glib, libao, intltool, libmirage }:
let pkg = import ./base.nix { let pkg = import ./base.nix {
version = "3.1.0"; version = "3.2.2";
pkgName = "cdemu-daemon"; pkgName = "cdemu-daemon";
pkgSha256 = "0kxwhwjvcr40sjlrvln9gasjwkkfc3wxpcz0rxmffp92w8phz3s9"; pkgSha256 = "0himyrhhfjsr4ff5aci7240bpm9x34h20pid412ci8fm16nk929b";
}; };
in callPackage pkg { in callPackage pkg {
buildInputs = [ glib libao (callPackage ./libmirage.nix {}) intltool ]; buildInputs = [ glib libao libmirage intltool ];
} }

View file

@ -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 let
pkg = import ./base.nix { pkg = import ./base.nix {
version = "3.1.0"; version = "3.2.1";
pkgName = "gcdemu"; pkgName = "gcdemu";
pkgSha256 = "0rmnw302fk9vli22v54qx19lqxy23syxi154klxz2vma009q0p02"; pkgSha256 = "0lmyvhbf57wcm8k2a33j2dhy4gblaiycy33q070gdrxi37xk7w5g";
}; };
inherit (pythonPackages) python pygobject3; inherit (python3Packages) python pygobject3;
in callPackage pkg { in callPackage pkg {
buildInputs = [ python pygobject3 gtk3 glib libnotify intltool makeWrapper buildInputs = [ python pygobject3 gtk3 glib libnotify intltool makeWrapper
gnome3.adwaita-icon-theme gdk_pixbuf librsvg ]; gnome3.adwaita-icon-theme gdk_pixbuf librsvg ];
drvParams = { drvParams = {
nativeBuildInputs = [ gobject-introspection cmake ];
postFixup = '' postFixup = ''
wrapProgram $out/bin/gcdemu \ wrapProgram $out/bin/gcdemu \
--set PYTHONPATH "$PYTHONPATH" \ --set PYTHONPATH "$PYTHONPATH" \

View file

@ -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 { let pkg = import ./base.nix {
version = "3.1.0"; version = "3.2.2";
pkgName = "libmirage"; pkgName = "libmirage";
pkgSha256 = "0qvkvnvxqx8hqzcqzh7sqjzgbc1nrd91lzv33lr8c6fgaq8cqzmn"; pkgSha256 = "0gwrfia0fyhi0b3p2pfyyvrcfcb0qysfzgpdqsqjqbx4xaqx5wpi";
}; };
in callPackage pkg { in callPackage pkg {
buildInputs = [ glib libsndfile zlib bzip2 lzma libsamplerate intltool ]; 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 ];
};
} }