diff options
author | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
---|---|---|
committer | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
commit | 80d90d9b204f7c17912740f9f414fe5d59f293ba (patch) | |
tree | 5f2065a06e724270610760d59d01c6888b375a46 /infra/libkookie/nixpkgs/pkgs/development/compilers/nasm/default.nix | |
parent | 3a31a84c7d3e589035ad08499206aac44a81f424 (diff) | |
parent | 83cbad92d73216bb0d9187c56cce0b91f9121d5a (diff) |
Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/compilers/nasm/default.nix')
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/development/compilers/nasm/default.nix | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/nasm/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/nasm/default.nix index 67665c3bab18..89217db6818f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/compilers/nasm/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/nasm/default.nix @@ -1,27 +1,25 @@ -{ stdenv, fetchFromRepoOrCz, autoreconfHook, perl, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }: +{ stdenv, fetchurl, perl }: stdenv.mkDerivation rec { pname = "nasm"; - version = "2.14.02"; + version = "2.15.05"; - src = fetchFromRepoOrCz { - repo = "nasm"; - rev = "${pname}-${version}"; - sha256 = "15z6ybnzlsrqs2964h6czqhpmr7vc3ln4y4h0z9vrznk4mqcwbsa"; + src = fetchurl { + url = "https://www.nasm.us/pub/nasm/releasebuilds/${version}/${pname}-${version}.tar.xz"; + sha256 = "0gqand86b0r86k3h46dh560lykxmxqqywz5m55kgjfq7q4lngbrw"; }; - nativeBuildInputs = [ autoreconfHook perl asciidoc xmlto docbook_xml_dtd_45 docbook_xsl ]; + nativeBuildInputs = [ perl ]; - postBuild = "make manpages"; + enableParallelBuilding = true; doCheck = true; checkPhase = '' - make golden && make test + make golden + make test ''; - NIX_CFLAGS_COMPILE="-Wno-error=attributes"; - meta = with stdenv.lib; { homepage = "https://www.nasm.us/"; description = "An 80x86 and x86-64 assembler designed for portability and modularity"; |