diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-04-15 23:57:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-15 23:57:58 +0200 |
| commit | 3783fb8475c4ff4a873bd873c240887d8c6587c4 (patch) | |
| tree | ba83b34c0930beb4d9ed0ce5cb0da3382748f569 /pkgs/development/compilers | |
| parent | 6d22c594347dad7b295908cdd8c286095ed9654d (diff) | |
| parent | b85a2687bf58f7e64abfdec3a373dffdbfc6d9fa (diff) | |
| download | nixpkgs-3783fb8475c4ff4a873bd873c240887d8c6587c4.tar nixpkgs-3783fb8475c4ff4a873bd873c240887d8c6587c4.tar.gz nixpkgs-3783fb8475c4ff4a873bd873c240887d8c6587c4.tar.bz2 nixpkgs-3783fb8475c4ff4a873bd873c240887d8c6587c4.tar.lz nixpkgs-3783fb8475c4ff4a873bd873c240887d8c6587c4.tar.xz nixpkgs-3783fb8475c4ff4a873bd873c240887d8c6587c4.tar.zst nixpkgs-3783fb8475c4ff4a873bd873c240887d8c6587c4.zip | |
Merge pull request #116826 from OPNA2608/update/libsidplayfp-2.1.1/21.05
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/xa/dxa.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/compilers/xa/xa.nix | 26 |
2 files changed, 26 insertions, 5 deletions
diff --git a/pkgs/development/compilers/xa/dxa.nix b/pkgs/development/compilers/xa/dxa.nix index 03f2d054cc8..56661c1dbcc 100644 --- a/pkgs/development/compilers/xa/dxa.nix +++ b/pkgs/development/compilers/xa/dxa.nix @@ -9,7 +9,10 @@ stdenv.mkDerivation rec { version = "0.1.4"; src = fetchurl { - url = "https://www.floodgap.com/retrotech/xa/dists/${pname}-${version}.tar.gz"; + urls = [ + "https://www.floodgap.com/retrotech/xa/dists/${pname}-${version}.tar.gz" + "https://www.floodgap.com/retrotech/xa/dists/unsupported/${pname}-${version}.tar.gz" + ]; hash = "sha256-C0rgwK51Ij9EZCm9GeiVnWIkEkse0d60ok8G9hm2a5U="; }; diff --git a/pkgs/development/compilers/xa/xa.nix b/pkgs/development/compilers/xa/xa.nix index c445940f5cd..dbeabe97b1a 100644 --- a/pkgs/development/compilers/xa/xa.nix +++ b/pkgs/development/compilers/xa/xa.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, perl }: stdenv.mkDerivation rec { @@ -8,22 +9,39 @@ stdenv.mkDerivation rec { version = "2.3.11"; src = fetchurl { - url = "https://www.floodgap.com/retrotech/xa/dists/${pname}-${version}.tar.gz"; + urls = [ + "https://www.floodgap.com/retrotech/xa/dists/${pname}-${version}.tar.gz" + "https://www.floodgap.com/retrotech/xa/dists/unsupported/${pname}-${version}.tar.gz" + ]; hash = "sha256-MvIWTJnjBSGOmSlwhW3Y4jCbXLasR1jXsq/jv+vJAS0="; }; + checkInputs = [ perl ]; + dontConfigure = true; postPatch = '' substituteInPlace Makefile \ - --replace "DESTDIR" "PREFIX" \ --replace "CC = gcc" "CC = ${stdenv.cc.targetPrefix}cc" \ - --replace "LDD = gcc" "LDD = ${stdenv.cc.targetPrefix}cc" \ + --replace "LD = gcc" "LD = ${stdenv.cc.targetPrefix}cc" \ --replace "CFLAGS = -O2" "CFLAGS ?=" \ --replace "LDFLAGS = -lc" "LDFLAGS ?= -lc" ''; - makeFlags = [ "PREFIX=${placeholder "out"}" ]; + makeFlags = [ + "DESTDIR:=${placeholder "out"}" + ]; + + enableParallelBuilding = true; + + doCheck = true; + + # Running tests in parallel does not work + enableParallelChecking = false; + + preCheck = '' + patchShebangs tests + ''; meta = with lib; { homepage = "https://www.floodgap.com/retrotech/xa/"; |