Merge staging-next into master

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

pkgs/development/compilers/llvm/4/libc++/libc++.a

@@ -1 +0,0 @@
-INPUT(-lc++_static -lc++abi)

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

pkgs/development/compilers/llvm/5/libc++/libc++.a

@@ -1 +0,0 @@
-INPUT(-lc++_static -lc++abi)

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

pkgs/development/compilers/llvm/6/libc++/libc++.a

@@ -1 +0,0 @@
-INPUT(-lc++_static -lc++abi)

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

pkgs/development/compilers/llvm/7/libc++/libc++.a

@@ -1 +0,0 @@
-INPUT(-lc++_static -lc++abi)

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;