From 7a32e683938dda07590da2ddf23dae211b8b0c1d Mon Sep 17 00:00:00 2001 From: Renaud Date: Wed, 15 Nov 2017 22:13:24 +0100 Subject: libx86emu: 1.5 -> 1.12 --- pkgs/development/libraries/libx86emu/default.nix | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'pkgs/development/libraries/libx86emu') diff --git a/pkgs/development/libraries/libx86emu/default.nix b/pkgs/development/libraries/libx86emu/default.nix index ee32d9418dd..b745098bd64 100644 --- a/pkgs/development/libraries/libx86emu/default.nix +++ b/pkgs/development/libraries/libx86emu/default.nix @@ -1,27 +1,29 @@ -{ stdenv, fetchurl, perl }: +{ stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation rec { name = "libx86emu-${version}"; - version = "1.5"; + version = "1.12"; - src = fetchurl { - url = "https://github.com/wfeldt/libx86emu/archive/${version}.tar.gz"; - sha256 = "1im6w6m0bl6ajynx4hc028lad8v10whv4y7w9zxndzh3j4mi3aa8"; + src = fetchFromGitHub { + owner = "wfeldt"; + repo = "libx86emu"; + rev = version; + sha256 = "0dlzvwdkk0vc6qf0a0zzbxki3pig1mda8p3fa54rxqaxkwp4mqr6"; }; - buildInputs = [ perl ]; + nativeBuildInputs = [ perl ]; + postUnpack = "rm $sourceRoot/git2log"; patchPhase = '' # VERSION is usually generated using Git echo "${version}" > VERSION - sed -i 's|/usr/|/|g' Makefile + substituteInPlace Makefile --replace "/usr" "/" ''; - makeFlags = [ "shared" ]; + buildFlags = [ "shared" ]; + enableParallelBuilding = true; - installPhase = '' - make install DESTDIR=$out/ LIBDIR=lib - ''; + installFlags = [ "DESTDIR=$(out)" "LIBDIR=/lib" ]; meta = with stdenv.lib; { description = "x86 emulation library"; -- cgit 1.4.1