lol

Merge pull request #7574 from codyopel/v86d

v86d: refactor

+19 -13
+19 -13
pkgs/os-specific/linux/v86d/default.nix
··· 1 - {stdenv, fetchurl, klibc, kernel, withKlibc ? true}: 1 + { stdenv, fetchurl 2 + , kernel, klibc 3 + }: 2 4 3 5 stdenv.mkDerivation rec { 4 6 name = "v86d-${version}-${kernel.version}"; 5 7 version = "0.1.10"; 6 8 7 9 src = fetchurl { 8 - url = "mirror://gentoo/distfiles//v86d-${version}.tar.bz2"; 9 - sha256 = "0p3kwqjis941pns9948dxfnjnl5lwd8f2b6x794whs7g32p68jb3"; 10 + url = "https://github.com/mjanusz/v86d/archive/v86d-${version}.tar.gz"; 11 + sha256 = "1flnpp8rc945cxr6jr9dlm8mi8gr181zrp2say4269602s1a4ymg"; 10 12 }; 11 13 12 - buildInputs = stdenv.lib.optional withKlibc klibc; 13 - 14 - configurePhase = '' 15 - bash ./configure $configureFlags 14 + patchPhase = '' 15 + patchShebangs configure 16 16 ''; 17 17 18 - configureFlags = if withKlibc then [ "--with-klibc" ] else [ "--default" ]; 18 + configureFlags = [ "--with-klibc" "--with-x86emu" ]; 19 19 20 20 makeFlags = [ 21 21 "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source" 22 22 "DESTDIR=$(out)" 23 23 ]; 24 24 25 - meta = { 26 - description = "A userspace helper that runs x86 code in an emulated environment"; 27 - homepage = http://dev.gentoo.org/~spock/projects/uvesafb/; 28 - license = stdenv.lib.licenses.gpl2; 25 + configurePhase = '' 26 + ./configure $configureFlags 27 + ''; 28 + 29 + buildInputs = [ klibc ]; 30 + 31 + meta = with stdenv.lib; { 32 + description = "A daemon to run x86 code in an emulated environment"; 33 + homepage = https://github.com/mjanusz/v86d; 34 + license = licenses.gpl2; 35 + maintainers = with maintainers; [ codyopel ]; 29 36 platforms = [ "i686-linux" "x86_64-linux" ]; 30 37 }; 31 38 } 32 -