diff options
| author | Robert Helgesson <robert@rycee.net> | 2015-12-30 15:41:17 +0100 |
|---|---|---|
| committer | Robert Helgesson <robert@rycee.net> | 2015-12-30 21:15:15 +0100 |
| commit | 73ede34fe55e81a48b122792d1ae814ab0990427 (patch) | |
| tree | 3b6af399675fdba8b4611abd098bb747cd8d0aae /pkgs/tools/system/vbetool | |
| parent | 23675945754e9e394fc317e0483d10c6417a6f11 (diff) | |
| download | nixpkgs-73ede34fe55e81a48b122792d1ae814ab0990427.tar nixpkgs-73ede34fe55e81a48b122792d1ae814ab0990427.tar.gz nixpkgs-73ede34fe55e81a48b122792d1ae814ab0990427.tar.bz2 nixpkgs-73ede34fe55e81a48b122792d1ae814ab0990427.tar.lz nixpkgs-73ede34fe55e81a48b122792d1ae814ab0990427.tar.xz nixpkgs-73ede34fe55e81a48b122792d1ae814ab0990427.tar.zst nixpkgs-73ede34fe55e81a48b122792d1ae814ab0990427.zip | |
vbetool: use stdenv
This replaces use of `builderDefsPackage`.
Diffstat (limited to 'pkgs/tools/system/vbetool')
| -rw-r--r-- | pkgs/tools/system/vbetool/default.nix | 43 | ||||
| -rw-r--r-- | pkgs/tools/system/vbetool/src-for-default.nix | 9 | ||||
| -rw-r--r-- | pkgs/tools/system/vbetool/src-info-for-default.nix | 4 |
3 files changed, 19 insertions, 37 deletions
diff --git a/pkgs/tools/system/vbetool/default.nix b/pkgs/tools/system/vbetool/default.nix index 402f93ec8fb..a8c27a42b1d 100644 --- a/pkgs/tools/system/vbetool/default.nix +++ b/pkgs/tools/system/vbetool/default.nix @@ -1,31 +1,26 @@ -a @ {pciutils, libx86, zlib, ...} : -let - s = import ./src-for-default.nix; - buildInputs = with a; [ - libx86 pciutils zlib - ]; -in -rec { - src = a.fetchUrlFromSrcInfo s; +{ stdenv, fetchurl, pciutils, libx86, zlib }: - inherit (s) name; - inherit buildInputs; - configureFlags = []; +stdenv.mkDerivation rec { + name = "vbetool-${version}"; + version = "1.1"; - /* doConfigure should be removed if not needed */ - phaseNames = ["fixPCIref" "doConfigure" "doMakeInstall"]; + src = fetchurl { + url = "http://www.codon.org.uk/~mjg59/vbetool/download/${name}.tar.gz"; + sha256 = "0m7rc9v8nz6w9x4x96maza139kin6lg4hscy6i13fna4672ds9jd"; + }; + + buildInputs = [ pciutils libx86 zlib ]; + + patchPhase = '' + substituteInPlace Makefile.in --replace '$(libdir)/libpci.a' "" + ''; - fixPCIref = a.fullDepEntry ('' - sed -e 's@$(libdir)/libpci.a@${a.pciutils}/lib/libpci.so@' -i Makefile.in - export NIX_LDFLAGS="$NIX_LDFLAGS -lpci" - '') ["doUnpack" "minInit"]; + configureFlags = [ "LDFLAGS=-lpci" ]; - meta = { + meta = with stdenv.lib; { description = "Video BIOS execution tool"; - maintainers = [ - a.lib.maintainers.raskin - ]; - platforms = with a.lib.platforms; - linux; + homepage = http://www.codon.org.uk/~mjg59/vbetool/; + maintainers = [ maintainers.raskin ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/system/vbetool/src-for-default.nix b/pkgs/tools/system/vbetool/src-for-default.nix deleted file mode 100644 index 97621fd516b..00000000000 --- a/pkgs/tools/system/vbetool/src-for-default.nix +++ /dev/null @@ -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"; - - -} diff --git a/pkgs/tools/system/vbetool/src-info-for-default.nix b/pkgs/tools/system/vbetool/src-info-for-default.nix deleted file mode 100644 index 40c721bc490..00000000000 --- a/pkgs/tools/system/vbetool/src-info-for-default.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ - downloadPage = "http://www.codon.org.uk/~mjg59/vbetool/download/?C=M;O=D"; - baseName = "vbetool"; -} |