diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-11 09:40:10 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-11 09:40:10 +0200 |
| commit | 22cb7f25f2f939a5e38f5e0c0920a743c37a9480 (patch) | |
| tree | 0f40b2088d8ffcaab6d43cda6a4ee92931a35a83 /pkgs/development/compilers | |
| parent | 6049c39bdb3d8bfc01e2a86d2fc6ef6e46f9b0be (diff) | |
| parent | 08b828d1c5169c08bce148df53cb1215b58e64d0 (diff) | |
| download | nixlib-22cb7f25f2f939a5e38f5e0c0920a743c37a9480.tar nixlib-22cb7f25f2f939a5e38f5e0c0920a743c37a9480.tar.gz nixlib-22cb7f25f2f939a5e38f5e0c0920a743c37a9480.tar.bz2 nixlib-22cb7f25f2f939a5e38f5e0c0920a743c37a9480.tar.lz nixlib-22cb7f25f2f939a5e38f5e0c0920a743c37a9480.tar.xz nixlib-22cb7f25f2f939a5e38f5e0c0920a743c37a9480.tar.zst nixlib-22cb7f25f2f939a5e38f5e0c0920a743c37a9480.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/colm/cross-compile.patch | 13 | ||||
| -rw-r--r-- | pkgs/development/compilers/colm/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/compilers/nvidia-cg-toolkit/default.nix | 2 |
3 files changed, 18 insertions, 3 deletions
diff --git a/pkgs/development/compilers/colm/cross-compile.patch b/pkgs/development/compilers/colm/cross-compile.patch new file mode 100644 index 000000000000..470ea23aaf1b --- /dev/null +++ b/pkgs/development/compilers/colm/cross-compile.patch @@ -0,0 +1,13 @@ +--- a/configure.ac 2019-07-09 22:41:03.166948024 -0700 ++++ b/configure.ac 2019-07-09 22:41:16.699948056 -0700 +@@ -40,9 +40,7 @@ + + dnl Choose a default for the build_manual var. If the dist file is present in + dnl the root then default to no, otherwise go for it. +-AC_CHECK_FILES( [$srcdir/DIST], +- [. $srcdir/DIST;], +- [build_manual=yes; ] ) ++build_manual=yes; + + dnl Set to true if the manual should be built. + AM_CONDITIONAL(BUILD_MANUAL, [test "x$build_manual" = "xyes"]) diff --git a/pkgs/development/compilers/colm/default.nix b/pkgs/development/compilers/colm/default.nix index 888750efdf97..237a80280ec8 100644 --- a/pkgs/development/compilers/colm/default.nix +++ b/pkgs/development/compilers/colm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, gcc, asciidoc }: +{ stdenv, fetchurl, makeWrapper, gcc, asciidoc, autoreconfHook }: stdenv.mkDerivation rec { name = "colm-${version}"; @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "0f76iri173l2wja2v7qrwmf958cqwh5g9x4bhj2z8wknmlla6gz4"; }; - nativeBuildInputs = [ makeWrapper asciidoc ]; + patches = [ ./cross-compile.patch ]; + + nativeBuildInputs = [ makeWrapper asciidoc autoreconfHook ]; doCheck = true; diff --git a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix index b6e2aea7eca5..6bd4af05da36 100644 --- a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix +++ b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://developer.nvidia.com/cg-toolkit; + homepage = https://developer.nvidia.com/cg-toolkit; license = lib.licenses.unfreeRedistributable; }; } |