cdmemu: fix cross eval

there's still many improvements that can be done to cdemu expressions
This commit is contained in:
Artturin 2022-08-14 07:33:04 +03:00
parent 2fe86cc267
commit 8344f3e888
6 changed files with 12 additions and 13 deletions

View File

@ -6,11 +6,10 @@ let pkg = import ./base.nix {
pkgSha256 = "00906lky0z1m0bdqnjmzxgcb19dzvljhddhh42lixyr53sjp94cc";
};
in callPackage pkg {
buildInputs = [ glib gtk3 libxml2 gnuplot libmirage makeWrapper
gnome.adwaita-icon-theme gdk-pixbuf librsvg intltool
buildInputs = [ glib gtk3 libxml2 gnuplot libmirage gnome.adwaita-icon-theme gdk-pixbuf librsvg
python3Packages.python python3Packages.pygobject3 python3Packages.matplotlib ];
drvParams = {
nativeBuildInputs = [ gobject-introspection cmake ];
nativeBuildInputs = [ gobject-introspection cmake makeWrapper intltool ];
postFixup = ''
wrapProgram $out/bin/image-analyzer \
--set PYTHONPATH "$PYTHONPATH" \

View File

@ -1,12 +1,12 @@
{ pname, version, pkgSha256 }:
{ lib, stdenv, fetchurl, cmake, pkg-config, buildInputs, drvParams ? {} }:
attrs@{ lib, stdenv, fetchurl, cmake, pkg-config, buildInputs, drvParams ? {}, ... }:
stdenv.mkDerivation ( rec {
inherit pname version buildInputs;
src = fetchurl {
url = "mirror://sourceforge/cdemu/${pname}-${version}.tar.xz";
sha256 = pkgSha256;
};
nativeBuildInputs = [ pkg-config cmake ];
nativeBuildInputs = (attrs.nativeBuildInputs or [ ]) ++ [ pkg-config cmake ];
setSourceRoot = ''
mkdir build
cd build

View File

@ -5,8 +5,8 @@ let pkg = import ./base.nix {
pkgSha256 = "1prrdhv0ia0axc6b73crszqzh802wlkihz6d100yvg7wbgmqabd7";
};
in callPackage pkg {
buildInputs = [ python3Packages.python python3Packages.dbus-python python3Packages.pygobject3
intltool makeWrapper ];
nativeBuildInputs = [ makeWrapper intltool ];
buildInputs = [ python3Packages.python python3Packages.dbus-python python3Packages.pygobject3 ];
drvParams = {
postFixup = ''
wrapProgram $out/bin/cdemu \

View File

@ -5,5 +5,6 @@ let pkg = import ./base.nix {
pkgSha256 = "16g6fv1lxkdmbsy6zh5sj54dvgwvm900fd18aq609yg8jnqm644d";
};
in callPackage pkg {
buildInputs = [ glib libao libmirage intltool ];
nativeBuildInputs = [ intltool ];
buildInputs = [ glib libao libmirage ];
}

View File

@ -8,10 +8,9 @@ let
};
inherit (python3Packages) python pygobject3;
in callPackage pkg {
buildInputs = [ python pygobject3 gtk3 glib libnotify intltool makeWrapper
gnome.adwaita-icon-theme gdk-pixbuf librsvg ];
buildInputs = [ python pygobject3 gtk3 glib libnotify gnome.adwaita-icon-theme gdk-pixbuf librsvg ];
drvParams = {
nativeBuildInputs = [ gobject-introspection cmake ];
nativeBuildInputs = [ gobject-introspection cmake makeWrapper intltool ];
postFixup = ''
wrapProgram $out/bin/gcdemu \
--set PYTHONPATH "$PYTHONPATH" \

View File

@ -8,11 +8,11 @@ let pkg = import ./base.nix {
pkgSha256 = "0f8i2ha44rykkk3ac2q8zsw3y1zckw6qnf6zvkyrj3qqbzhrf3fm";
};
in callPackage pkg {
buildInputs = [ glib libsndfile zlib bzip2 xz libsamplerate intltool ];
buildInputs = [ glib libsndfile zlib bzip2 xz libsamplerate ];
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 pkg-config ];
nativeBuildInputs = [ cmake gobject-introspection pkg-config intltool ];
propagatedBuildInputs = [ pcre util-linux libselinux libsepol ];
};
}