public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #11067: SmartOS updates

Browse Source 
I amended some commits slightly.
This commit is contained in:
Vladimír Čunát
2015-11-23 14:45:44 +01:00
parent 5bc8241348 baf7fdcb75
commit 13eca6f79a
31 changed files with 103 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/tools/misc/pkgconfig/default.nix
View File

@@ -10,9 +10,10 @@ stdenv.mkDerivation (rec {
sha256 = "0sq09a39wj4cxf8l2jvkq067g08ywfma4v6nhprnf351s82pfl68";
};
buildInputs = stdenv.lib.optional (stdenv.isCygwin || stdenv.isDarwin) libiconv;
buildInputs = stdenv.lib.optional (stdenv.isCygwin || stdenv.isDarwin || stdenv.isSunOS) libiconv;
configureFlags = [ "--with-internal-glib" ];
configureFlags = [ "--with-internal-glib" ]
++ stdenv.lib.optional (stdenv.isSunOS) [ "--with-libiconv=gnu" "--with-system-library-path" "--with-system-include-path" "CFLAGS=-DENABLE_NLS" ];
patches = (if vanilla then [] else [
# Process Requires.private properly, see

7
pkgs/development/tools/misc/texinfo/6.0.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, ncurses, perl, xz, interactive ? false }:
{ stdenv, fetchurl, ncurses, perl, xz, libiconv, gawk, interactive ? false }:
stdenv.mkDerivation rec {
name = "texinfo-6.0";
@@ -9,14 +9,17 @@ stdenv.mkDerivation rec {
};
buildInputs = [ perl xz ]
++ stdenv.lib.optionals stdenv.isSunOS [ libiconv gawk ]
++ stdenv.lib.optional interactive ncurses;
configureFlags = stdenv.lib.optionalString stdenv.isSunOS "AWK=${gawk}/bin/awk";
preInstall = ''
installFlags="TEXMF=$out/texmf-dist";
installTargets="install install-tex";
'';
doCheck = !stdenv.isDarwin && !interactive;
doCheck = !stdenv.isDarwin && !interactive && !stdenv.isSunOS/*flaky*/;
meta = {
homepage = "http://www.gnu.org/software/texinfo/";