diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2017-04-10 08:50:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-10 08:50:15 +0200 |
| commit | f8230518a2618963d3fcd2278b773c4dc075c1ba (patch) | |
| tree | 40157638377b2bae7df815296b88206942133c7c /pkgs/tools | |
| parent | 3766b8773733d67b9035810a03a3afe74490fade (diff) | |
| parent | dd25b6da62ca6bb6a28a87a39e3505cf6b6a933a (diff) | |
Merge pull request #24762 from matthewbauer/darwin-misc-fixes
darwin: miscellaneous fixes
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/compression/zstdmt/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/misc/rrdtool/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/networking/nuttcp/default.nix | 2 | ||||
| -rwxr-xr-x | pkgs/tools/typesetting/lout/builder.sh | 2 |
4 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/tools/compression/zstdmt/default.nix b/pkgs/tools/compression/zstdmt/default.nix index 14dd4f21b2dcb..5cf88e68c64b5 100644 --- a/pkgs/tools/compression/zstdmt/default.nix +++ b/pkgs/tools/compression/zstdmt/default.nix @@ -17,9 +17,7 @@ stdenv.mkDerivation rec { zstd lz4 ]; - buildPhase = '' - make zstdmt lz4mt - ''; + makeFlags = [ "CC=cc" "zstdmt" "lz4mt" ]; installPhase = '' mkdir -p $out/bin/ diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix index de4c97731ef5c..3d2666add420b 100644 --- a/pkgs/tools/misc/rrdtool/default.nix +++ b/pkgs/tools/misc/rrdtool/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, gettext, perl, pkgconfig, libxml2, pango, cairo, groff -, tcl-8_5 }: +, tcl-8_5, darwin }: stdenv.mkDerivation rec { name = "rrdtool-1.6.0"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gettext perl libxml2 pango cairo groff ] - ++ stdenv.lib.optional stdenv.isDarwin tcl-8_5; + ++ stdenv.lib.optionals stdenv.isDarwin [ tcl-8_5 darwin.apple_sdk.frameworks.ApplicationServices ]; postInstall = '' # for munin and rrdtool support diff --git a/pkgs/tools/networking/nuttcp/default.nix b/pkgs/tools/networking/nuttcp/default.nix index 70f3d7e9c70a8..23cce602875a4 100644 --- a/pkgs/tools/networking/nuttcp/default.nix +++ b/pkgs/tools/networking/nuttcp/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { unpackPhase = ":"; buildPhase = '' - gcc -O2 -o nuttcp $src + cc -O2 -o nuttcp $src ''; installPhase = '' diff --git a/pkgs/tools/typesetting/lout/builder.sh b/pkgs/tools/typesetting/lout/builder.sh index ec52adc225bca..cd3b9c67e3c92 100755 --- a/pkgs/tools/typesetting/lout/builder.sh +++ b/pkgs/tools/typesetting/lout/builder.sh @@ -39,6 +39,6 @@ cat makefile | \ > "$nixMakefile" && \ mkdir -p "$out/bin" && mkdir -p "$out/lib" \ mkdir -p "$out/man" && mkdir -p "$out/doc/lout" && \ -make -f "$nixMakefile" install installman && \ +make -f "$nixMakefile" CC=cc install installman && \ installDoc && \ fixupPhase |