diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-03-01 09:06:20 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-03-01 09:06:20 +0100 |
| commit | 2fcb11a2442b27834db87b2f62511037c31b5e36 (patch) | |
| tree | e9d38370aac7632cd35207180dc7c87d2bb6171d /pkgs/development/compilers | |
| parent | 456ff62ff820bbb2debd4568a775d88e61fd8bd1 (diff) | |
| parent | fc4a8f63c4e46652d484b127162641be36481363 (diff) | |
| download | nixlib-2fcb11a2442b27834db87b2f62511037c31b5e36.tar nixlib-2fcb11a2442b27834db87b2f62511037c31b5e36.tar.gz nixlib-2fcb11a2442b27834db87b2f62511037c31b5e36.tar.bz2 nixlib-2fcb11a2442b27834db87b2f62511037c31b5e36.tar.lz nixlib-2fcb11a2442b27834db87b2f62511037c31b5e36.tar.xz nixlib-2fcb11a2442b27834db87b2f62511037c31b5e36.tar.zst nixlib-2fcb11a2442b27834db87b2f62511037c31b5e36.zip | |
Merge staging-next into master
Diffstat (limited to 'pkgs/development/compilers')
9 files changed, 8 insertions, 29 deletions
diff --git a/pkgs/development/compilers/llvm/4/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix index 6344304b84bf..2b543b9d793a 100644 --- a/pkgs/development/compilers/llvm/4/libc++/default.nix +++ b/pkgs/development/compilers/llvm/4/libc++/default.nix @@ -44,11 +44,6 @@ stdenv.mkDerivation rec { linkCxxAbi = stdenv.isLinux; - postInstall = '' - mv $out/lib/libc++.a $out/lib/libc++_static.a - cp ${./libc++.a} $out/lib/libc++.a - ''; - setupHooks = [ ../../../../../build-support/setup-hooks/role.bash ./setup-hook.sh diff --git a/pkgs/development/compilers/llvm/4/libc++/libc++.a b/pkgs/development/compilers/llvm/4/libc++/libc++.a deleted file mode 100644 index f676948115eb..000000000000 --- a/pkgs/development/compilers/llvm/4/libc++/libc++.a +++ /dev/null @@ -1 +0,0 @@ -INPUT(-lc++_static -lc++abi) diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix index 6dc81e10163f..b182f1250e72 100644 --- a/pkgs/development/compilers/llvm/5/libc++/default.nix +++ b/pkgs/development/compilers/llvm/5/libc++/default.nix @@ -38,11 +38,6 @@ stdenv.mkDerivation rec { linkCxxAbi = stdenv.isLinux; - postInstall = '' - mv $out/lib/libc++.a $out/lib/libc++_static.a - cp ${./libc++.a} $out/lib/libc++.a - ''; - setupHooks = [ ../../../../../build-support/setup-hooks/role.bash ./setup-hook.sh diff --git a/pkgs/development/compilers/llvm/5/libc++/libc++.a b/pkgs/development/compilers/llvm/5/libc++/libc++.a deleted file mode 100644 index f676948115eb..000000000000 --- a/pkgs/development/compilers/llvm/5/libc++/libc++.a +++ /dev/null @@ -1 +0,0 @@ -INPUT(-lc++_static -lc++abi) diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix index b90b6b7b58c8..3a165e9da7b1 100644 --- a/pkgs/development/compilers/llvm/6/libc++/default.nix +++ b/pkgs/development/compilers/llvm/6/libc++/default.nix @@ -38,11 +38,6 @@ stdenv.mkDerivation rec { linkCxxAbi = stdenv.isLinux; - postInstall = '' - mv $out/lib/libc++.a $out/lib/libc++_static.a - cp ${./libc++.a} $out/lib/libc++.a - ''; - setupHooks = [ ../../../../../build-support/setup-hooks/role.bash ./setup-hook.sh diff --git a/pkgs/development/compilers/llvm/6/libc++/libc++.a b/pkgs/development/compilers/llvm/6/libc++/libc++.a deleted file mode 100644 index f676948115eb..000000000000 --- a/pkgs/development/compilers/llvm/6/libc++/libc++.a +++ /dev/null @@ -1 +0,0 @@ -INPUT(-lc++_static -lc++abi) diff --git a/pkgs/development/compilers/llvm/7/libc++/default.nix b/pkgs/development/compilers/llvm/7/libc++/default.nix index 8a13f3eb5903..d372984dac7c 100644 --- a/pkgs/development/compilers/llvm/7/libc++/default.nix +++ b/pkgs/development/compilers/llvm/7/libc++/default.nix @@ -36,11 +36,6 @@ stdenv.mkDerivation rec { linkCxxAbi = stdenv.isLinux; - postInstall = '' - mv $out/lib/libc++.a $out/lib/libc++_static.a - cp ${./libc++.a} $out/lib/libc++.a - ''; - setupHooks = [ ../../../../../build-support/setup-hooks/role.bash ./setup-hook.sh diff --git a/pkgs/development/compilers/llvm/7/libc++/libc++.a b/pkgs/development/compilers/llvm/7/libc++/libc++.a deleted file mode 100644 index f676948115eb..000000000000 --- a/pkgs/development/compilers/llvm/7/libc++/libc++.a +++ /dev/null @@ -1 +0,0 @@ -INPUT(-lc++_static -lc++abi) diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix index 8709c7186491..bfb3c154a3c7 100644 --- a/pkgs/development/compilers/nasm/default.nix +++ b/pkgs/development/compilers/nasm/default.nix @@ -1,15 +1,18 @@ -{ stdenv, fetchurl, perl }: +{ stdenv, fetchFromRepoOrCz, autoreconfHook, perl, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }: stdenv.mkDerivation rec { name = "nasm-${version}"; version = "2.14.02"; - src = fetchurl { - url = "https://www.nasm.us/pub/nasm/releasebuilds/${version}/${name}.tar.bz2"; - sha256 = "1g409sr1kj7v1089s9kv0i4azvddkcwcypnbakfryyi71b3jdz9l"; + src = fetchFromRepoOrCz { + repo = "nasm"; + rev = name; + sha256 = "15z6ybnzlsrqs2964h6czqhpmr7vc3ln4y4h0z9vrznk4mqcwbsa"; }; - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ autoreconfHook perl asciidoc xmlto docbook_xml_dtd_45 docbook_xsl ]; + + postBuild = "make manpages"; doCheck = true; |