vbetool: use stdenv
This replaces use of `builderDefsPackage`.
This commit is contained in:
parent
2367594575
commit
73ede34fe5
|
@ -1,31 +1,26 @@
|
||||||
a @ {pciutils, libx86, zlib, ...} :
|
{ stdenv, fetchurl, pciutils, libx86, zlib }:
|
||||||
let
|
|
||||||
s = import ./src-for-default.nix;
|
|
||||||
buildInputs = with a; [
|
|
||||||
libx86 pciutils zlib
|
|
||||||
];
|
|
||||||
in
|
|
||||||
rec {
|
|
||||||
src = a.fetchUrlFromSrcInfo s;
|
|
||||||
|
|
||||||
inherit (s) name;
|
stdenv.mkDerivation rec {
|
||||||
inherit buildInputs;
|
name = "vbetool-${version}";
|
||||||
configureFlags = [];
|
version = "1.1";
|
||||||
|
|
||||||
/* doConfigure should be removed if not needed */
|
src = fetchurl {
|
||||||
phaseNames = ["fixPCIref" "doConfigure" "doMakeInstall"];
|
url = "http://www.codon.org.uk/~mjg59/vbetool/download/${name}.tar.gz";
|
||||||
|
sha256 = "0m7rc9v8nz6w9x4x96maza139kin6lg4hscy6i13fna4672ds9jd";
|
||||||
|
};
|
||||||
|
|
||||||
fixPCIref = a.fullDepEntry (''
|
buildInputs = [ pciutils libx86 zlib ];
|
||||||
sed -e 's@$(libdir)/libpci.a@${a.pciutils}/lib/libpci.so@' -i Makefile.in
|
|
||||||
export NIX_LDFLAGS="$NIX_LDFLAGS -lpci"
|
|
||||||
'') ["doUnpack" "minInit"];
|
|
||||||
|
|
||||||
meta = {
|
patchPhase = ''
|
||||||
|
substituteInPlace Makefile.in --replace '$(libdir)/libpci.a' ""
|
||||||
|
'';
|
||||||
|
|
||||||
|
configureFlags = [ "LDFLAGS=-lpci" ];
|
||||||
|
|
||||||
|
meta = with stdenv.lib; {
|
||||||
description = "Video BIOS execution tool";
|
description = "Video BIOS execution tool";
|
||||||
maintainers = [
|
homepage = http://www.codon.org.uk/~mjg59/vbetool/;
|
||||||
a.lib.maintainers.raskin
|
maintainers = [ maintainers.raskin ];
|
||||||
];
|
platforms = platforms.linux;
|
||||||
platforms = with a.lib.platforms;
|
|
||||||
linux;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,9 +0,0 @@
|
||||||
rec {
|
|
||||||
version="1.1";
|
|
||||||
name="vbetool-1.1";
|
|
||||||
hash="0m7rc9v8nz6w9x4x96maza139kin6lg4hscy6i13fna4672ds9jd";
|
|
||||||
url="http://www.codon.org.uk/~mjg59/vbetool/download/vbetool-${version}.tar.gz";
|
|
||||||
advertisedUrl="http://www.codon.org.uk/~mjg59/vbetool/download/vbetool-1.1.tar.gz";
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,4 +0,0 @@
|
||||||
{
|
|
||||||
downloadPage = "http://www.codon.org.uk/~mjg59/vbetool/download/?C=M;O=D";
|
|
||||||
baseName = "vbetool";
|
|
||||||
}
|
|
|
@ -3365,7 +3365,7 @@ let
|
||||||
|
|
||||||
vidalia = callPackage ../tools/security/vidalia { };
|
vidalia = callPackage ../tools/security/vidalia { };
|
||||||
|
|
||||||
vbetool = builderDefsPackage (callPackage ../tools/system/vbetool) { };
|
vbetool = callPackage ../tools/system/vbetool { };
|
||||||
|
|
||||||
vde2 = callPackage ../tools/networking/vde2 { };
|
vde2 = callPackage ../tools/networking/vde2 { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue