cdmemu: fix cross eval
there's still many improvements that can be done to cdemu expressions
This commit is contained in:
parent
2fe86cc267
commit
8344f3e888
|
@ -6,11 +6,10 @@ let pkg = import ./base.nix {
|
||||||
pkgSha256 = "00906lky0z1m0bdqnjmzxgcb19dzvljhddhh42lixyr53sjp94cc";
|
pkgSha256 = "00906lky0z1m0bdqnjmzxgcb19dzvljhddhh42lixyr53sjp94cc";
|
||||||
};
|
};
|
||||||
in callPackage pkg {
|
in callPackage pkg {
|
||||||
buildInputs = [ glib gtk3 libxml2 gnuplot libmirage makeWrapper
|
buildInputs = [ glib gtk3 libxml2 gnuplot libmirage gnome.adwaita-icon-theme gdk-pixbuf librsvg
|
||||||
gnome.adwaita-icon-theme gdk-pixbuf librsvg intltool
|
|
||||||
python3Packages.python python3Packages.pygobject3 python3Packages.matplotlib ];
|
python3Packages.python python3Packages.pygobject3 python3Packages.matplotlib ];
|
||||||
drvParams = {
|
drvParams = {
|
||||||
nativeBuildInputs = [ gobject-introspection cmake ];
|
nativeBuildInputs = [ gobject-introspection cmake makeWrapper intltool ];
|
||||||
postFixup = ''
|
postFixup = ''
|
||||||
wrapProgram $out/bin/image-analyzer \
|
wrapProgram $out/bin/image-analyzer \
|
||||||
--set PYTHONPATH "$PYTHONPATH" \
|
--set PYTHONPATH "$PYTHONPATH" \
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
{ pname, version, pkgSha256 }:
|
{ pname, version, pkgSha256 }:
|
||||||
{ lib, stdenv, fetchurl, cmake, pkg-config, buildInputs, drvParams ? {} }:
|
attrs@{ lib, stdenv, fetchurl, cmake, pkg-config, buildInputs, drvParams ? {}, ... }:
|
||||||
stdenv.mkDerivation ( rec {
|
stdenv.mkDerivation ( rec {
|
||||||
inherit pname version buildInputs;
|
inherit pname version buildInputs;
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/cdemu/${pname}-${version}.tar.xz";
|
url = "mirror://sourceforge/cdemu/${pname}-${version}.tar.xz";
|
||||||
sha256 = pkgSha256;
|
sha256 = pkgSha256;
|
||||||
};
|
};
|
||||||
nativeBuildInputs = [ pkg-config cmake ];
|
nativeBuildInputs = (attrs.nativeBuildInputs or [ ]) ++ [ pkg-config cmake ];
|
||||||
setSourceRoot = ''
|
setSourceRoot = ''
|
||||||
mkdir build
|
mkdir build
|
||||||
cd build
|
cd build
|
||||||
|
|
|
@ -5,8 +5,8 @@ let pkg = import ./base.nix {
|
||||||
pkgSha256 = "1prrdhv0ia0axc6b73crszqzh802wlkihz6d100yvg7wbgmqabd7";
|
pkgSha256 = "1prrdhv0ia0axc6b73crszqzh802wlkihz6d100yvg7wbgmqabd7";
|
||||||
};
|
};
|
||||||
in callPackage pkg {
|
in callPackage pkg {
|
||||||
buildInputs = [ python3Packages.python python3Packages.dbus-python python3Packages.pygobject3
|
nativeBuildInputs = [ makeWrapper intltool ];
|
||||||
intltool makeWrapper ];
|
buildInputs = [ python3Packages.python python3Packages.dbus-python python3Packages.pygobject3 ];
|
||||||
drvParams = {
|
drvParams = {
|
||||||
postFixup = ''
|
postFixup = ''
|
||||||
wrapProgram $out/bin/cdemu \
|
wrapProgram $out/bin/cdemu \
|
||||||
|
|
|
@ -5,5 +5,6 @@ let pkg = import ./base.nix {
|
||||||
pkgSha256 = "16g6fv1lxkdmbsy6zh5sj54dvgwvm900fd18aq609yg8jnqm644d";
|
pkgSha256 = "16g6fv1lxkdmbsy6zh5sj54dvgwvm900fd18aq609yg8jnqm644d";
|
||||||
};
|
};
|
||||||
in callPackage pkg {
|
in callPackage pkg {
|
||||||
buildInputs = [ glib libao libmirage intltool ];
|
nativeBuildInputs = [ intltool ];
|
||||||
|
buildInputs = [ glib libao libmirage ];
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,10 +8,9 @@ let
|
||||||
};
|
};
|
||||||
inherit (python3Packages) 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 gnome.adwaita-icon-theme gdk-pixbuf librsvg ];
|
||||||
gnome.adwaita-icon-theme gdk-pixbuf librsvg ];
|
|
||||||
drvParams = {
|
drvParams = {
|
||||||
nativeBuildInputs = [ gobject-introspection cmake ];
|
nativeBuildInputs = [ gobject-introspection cmake makeWrapper intltool ];
|
||||||
postFixup = ''
|
postFixup = ''
|
||||||
wrapProgram $out/bin/gcdemu \
|
wrapProgram $out/bin/gcdemu \
|
||||||
--set PYTHONPATH "$PYTHONPATH" \
|
--set PYTHONPATH "$PYTHONPATH" \
|
||||||
|
|
|
@ -8,11 +8,11 @@ let pkg = import ./base.nix {
|
||||||
pkgSha256 = "0f8i2ha44rykkk3ac2q8zsw3y1zckw6qnf6zvkyrj3qqbzhrf3fm";
|
pkgSha256 = "0f8i2ha44rykkk3ac2q8zsw3y1zckw6qnf6zvkyrj3qqbzhrf3fm";
|
||||||
};
|
};
|
||||||
in callPackage pkg {
|
in callPackage pkg {
|
||||||
buildInputs = [ glib libsndfile zlib bzip2 xz libsamplerate intltool ];
|
buildInputs = [ glib libsndfile zlib bzip2 xz libsamplerate ];
|
||||||
drvParams = {
|
drvParams = {
|
||||||
PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "out"}/share/gir-1.0";
|
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";
|
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 ];
|
propagatedBuildInputs = [ pcre util-linux libselinux libsepol ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue