diff options
| author | Robin Gloster <mail@glob.in> | 2016-05-02 22:58:02 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-05-02 22:58:02 +0000 |
| commit | c92bca56f8ea5623cf01952621455db308d0f330 (patch) | |
| tree | f940e6e4fabd8e58b91fe885f9541205258023b2 /pkgs/tools/misc/grub4dos | |
| parent | 0fdde5efd08c036fe9d73b4e65f2ba9797053d0f (diff) | |
| parent | 94520a25adc6b6bee799ec9dab344cfdad3f7180 (diff) | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/tools/misc/grub4dos')
| -rw-r--r-- | pkgs/tools/misc/grub4dos/default.nix | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/pkgs/tools/misc/grub4dos/default.nix b/pkgs/tools/misc/grub4dos/default.nix index f0ac6b5f7c98b..400aa88e357a2 100644 --- a/pkgs/tools/misc/grub4dos/default.nix +++ b/pkgs/tools/misc/grub4dos/default.nix @@ -1,18 +1,21 @@ -{ stdenv, fetchurl, unzip, nasm }: +{ stdenv, fetchFromGitHub, nasm }: let arch = if stdenv.isi686 then "i386" else if stdenv.isx86_64 then "x86_64" else abort "Unknown architecture"; -in stdenv.mkDerivation { - name = "grub4dos-0.4.6a-2015-12-31"; - - src = fetchurl { - url = https://github.com/chenall/grub4dos/archive/a8024743c61cc4909514b27df07b7cc4bc89d1fb.zip; - sha256 = "1m5d7klb12qz5sa09919z7jchfafgh84cmpwilp52qnbpi3zh2fd"; +in stdenv.mkDerivation rec { + name = "grub4dos-${version}"; + version = "0.4.6a-2016-04-26"; + + src = fetchFromGitHub { + owner = "chenall"; + repo = "grub4dos"; + rev = "61d8229375c679436d56376518456723b2025e1a"; + sha256 = "1r4jmvykk5cvpf1kysykvksa9vfy7p29q20x72inw2pbhipj0f10"; }; - nativeBuildInputs = [ unzip nasm ]; + nativeBuildInputs = [ nasm ]; hardeningDisable = [ "stackprotector" ]; @@ -28,7 +31,7 @@ in stdenv.mkDerivation { dontPatchELF = true; meta = with stdenv.lib; { - homepage = http://grub4dos.chenall.net/; + homepage = "http://grub4dos.chenall.net/"; description = "GRUB for DOS is the dos extension of GRUB"; maintainers = with maintainers; [ abbradar ]; platforms = platforms.all; |