From 626b1c41017093f13d77688f80fb16fa51ca163a Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 30 Apr 2016 03:04:36 +0300 Subject: [PATCH] grub4dos: 0.4.6a-2015-12-31 -> 0.4.6a-2016-04-26 --- pkgs/tools/misc/grub4dos/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/grub4dos/default.nix b/pkgs/tools/misc/grub4dos/default.nix index e5c613f7a89b..0195022f7038 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"; +in stdenv.mkDerivation rec { + name = "grub4dos-${version}"; + version = "0.4.6a-2016-04-26"; - src = fetchurl { - url = https://github.com/chenall/grub4dos/archive/a8024743c61cc4909514b27df07b7cc4bc89d1fb.zip; - sha256 = "1m5d7klb12qz5sa09919z7jchfafgh84cmpwilp52qnbpi3zh2fd"; + src = fetchFromGitHub { + owner = "chenall"; + repo = "grub4dos"; + rev = "61d8229375c679436d56376518456723b2025e1a"; + sha256 = "1r4jmvykk5cvpf1kysykvksa9vfy7p29q20x72inw2pbhipj0f10"; }; - nativeBuildInputs = [ unzip nasm ]; + nativeBuildInputs = [ nasm ]; configureFlags = [ "--host=${arch}-pc-linux-gnu" ];