cdemu: use buildPythonApplication

This commit is contained in:
Herwig Hochleitner 2024-05-15 15:12:49 +02:00
parent f992763f18
commit 304f2767fa
4 changed files with 29 additions and 29 deletions

View File

@ -1,6 +1,6 @@
{ stdenv, cmake, pkg-config, callPackage, makeWrapper, gobject-introspection, wrapGAppsHook3
, python3Packages, gtk3, glib, libxml2, gnuplot, gnome, gdk-pixbuf, librsvg, intltool, libmirage }:
stdenv.mkDerivation {
{ cmake, pkg-config, callPackage, gobject-introspection, wrapGAppsHook3
, python3Packages, libxml2, gnuplot, gnome, gdk-pixbuf, intltool, libmirage }:
python3Packages.buildPythonApplication {
inherit (callPackage ./common-drv-attrs.nix {
version = "3.2.6";
@ -8,14 +8,14 @@ stdenv.mkDerivation {
hash = "sha256-7I8RUgd+k3cEzskJGbziv1f0/eo5QQXn62wGh/Y5ozc=";
}) pname version src meta;
buildInputs = [ libxml2 gnuplot libmirage gnome.adwaita-icon-theme gdk-pixbuf librsvg
python3Packages.pygobject3 python3Packages.matplotlib ];
nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 intltool ];
buildInputs = [ libxml2 gnuplot libmirage gnome.adwaita-icon-theme gdk-pixbuf ];
propagatedBuildInputs = with python3Packages; [ pygobject3 matplotlib ];
nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 intltool gobject-introspection ];
pyproject = false;
dontWrapGApps = true;
postFixup = ''
wrapProgram $out/bin/image-analyzer \
''${gappsWrapperArgs[@]} \
--set PYTHONPATH "$PYTHONPATH"
preFixup = ''
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
}

View File

@ -1,5 +1,5 @@
{ stdenv, callPackage, python3Packages, cmake, pkg-config, intltool, wrapGAppsNoGuiHook }:
stdenv.mkDerivation {
{ callPackage, python3Packages, cmake, pkg-config, intltool, wrapGAppsNoGuiHook, gobject-introspection }:
python3Packages.buildPythonApplication {
inherit (callPackage ./common-drv-attrs.nix {
version = "3.2.5";
@ -7,14 +7,13 @@ stdenv.mkDerivation {
hash = "sha256-py2F61v8vO0BCM18GCflAiD48deZjbMM6wqoCDZsOd8=";
}) pname version src meta;
nativeBuildInputs = [ cmake pkg-config intltool wrapGAppsNoGuiHook ];
buildInputs = with python3Packages; [ dbus-python pygobject3 ];
nativeBuildInputs = [ cmake pkg-config intltool wrapGAppsNoGuiHook gobject-introspection ];
propagatedBuildInputs = with python3Packages; [ dbus-python pygobject3 ];
pyproject = false;
dontWrapGApps = true;
postFixup = ''
wrapProgram $out/bin/cdemu \
''${gappsWrapperArgs[@]} \
--set PYTHONPATH "$PYTHONPATH"
preFixup = ''
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
}

View File

@ -1,6 +1,6 @@
{ stdenv, callPackage, cmake, pkg-config, wrapGAppsHook3
, python3Packages, libnotify, intltool, gnome, gdk-pixbuf, librsvg }:
stdenv.mkDerivation {
{ callPackage, cmake, pkg-config, wrapGAppsHook3, gobject-introspection
, python3Packages, libnotify, intltool, gnome, gdk-pixbuf }:
python3Packages.buildPythonApplication {
inherit (callPackage ./common-drv-attrs.nix {
version = "3.2.6";
@ -8,14 +8,14 @@ stdenv.mkDerivation {
hash = "sha256-w4vzKoSotL5Cjfr4Cu4YhNSWXJqS+n/vySrwvbhR1zA=";
}) pname version src meta;
nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 intltool ];
buildInputs = [ python3Packages.pygobject3 libnotify gnome.adwaita-icon-theme gdk-pixbuf librsvg ];
nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 intltool gobject-introspection ];
buildInputs = [ libnotify gnome.adwaita-icon-theme gdk-pixbuf ];
propagatedBuildInputs = with python3Packages; [ pygobject3 ];
pyproject = false;
dontWrapGApps = true;
postFixup = ''
wrapProgram $out/bin/gcdemu \
''${gappsWrapperArgs[@]} \
--set PYTHONPATH "$PYTHONPATH"
preFixup = ''
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';
}

View File

@ -1,4 +1,4 @@
{ stdenv, callPackage, cmake, pkg-config
{ stdenv, callPackage, cmake, pkg-config, gobject-introspection
, glib, libsndfile, zlib, bzip2, xz, libsamplerate, intltool
, pcre, util-linux, libselinux, libsepol }:
@ -13,6 +13,7 @@ stdenv.mkDerivation {
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";
buildInputs = [ glib libsndfile zlib bzip2 xz libsamplerate ];
nativeBuildInputs = [ cmake pkg-config intltool ];
nativeBuildInputs = [ cmake pkg-config intltool gobject-introspection ];
propagatedBuildInputs = [ pcre util-linux libselinux libsepol ];
}