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

Merge pull request #25066 from matthewbauer/less-darwin-eval-errors

Browse Source 
Add Darwin as platform to various "broken" packages that actually build
This commit is contained in:
Daiderd Jordan
2017-04-24 08:14:21 +02:00
committed by GitHub
parent 2df7f1b5b5 2060f5b1fc
commit 80828429d7
33 changed files with 76 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/tools/compression/lhasa/default.nix
View File

@@ -16,6 +16,6 @@ stdenv.mkDerivation {
license = stdenv.lib.licenses.isc;
homepage = http://fragglet.github.io/lhasa;
maintainers = with stdenv.lib; [ maintainers.sander ];
platforms = stdenv.lib.platforms.linux;
platforms = with stdenv.lib.platforms; linux ++ darwin;
};
}

2
pkgs/tools/graphics/icoutils/default.nix
View File

@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
homepage = http://www.nongnu.org/icoutils/;
description = "Set of programs to deal with Microsoft Windows(R) icon and cursor files";
license = stdenv.lib.licenses.gpl3Plus;
platforms = with stdenv.lib.platforms; linux;
platforms = with stdenv.lib.platforms; linux ++ darwin;
};
}

10
pkgs/tools/misc/desktop-file-utils/default.nix
View File

@@ -1,4 +1,6 @@
{ stdenv, fetchurl, pkgconfig, glib }:
{ stdenv, fetchurl, pkgconfig, glib, libintlOrEmpty }:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "desktop-file-utils-0.22";
@@ -8,11 +10,13 @@ stdenv.mkDerivation rec {
sha256 = "1ianvr2a69yjv4rpyv30w7yjsmnsb23crrka5ndqxycj4rkk4dc4";
};
buildInputs = [ pkgconfig glib ];
buildInputs = [ pkgconfig glib libintlOrEmpty ];
NIX_LDFLAGS = optionalString stdenv.isDarwin "-lintl";
meta = {
homepage = http://www.freedesktop.org/wiki/Software/desktop-file-utils;
description = "Command line utilities for working with .desktop files";
platforms = stdenv.lib.platforms.linux;
platforms = platforms.linux ++ platforms.darwin;
};
}

4
pkgs/tools/networking/flvstreamer/default.nix
View File

@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
buildPhase = ''
make posix
make CC=cc posix
'';
installPhase = ''
@@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
homepage = http://savannah.nongnu.org/projects/flvstreamer;
maintainers = [ stdenv.lib.maintainers.thammers ];
platforms = stdenv.lib.platforms.linux;
platforms = with stdenv.lib.platforms; linux ++ darwin;
};
}

2
pkgs/tools/networking/miniupnpc/default.nix
View File

@@ -19,7 +19,7 @@ let
meta = {
homepage = http://miniupnp.free.fr/;
description = "A client that implements the UPnP Internet Gateway Device (IGD) specification";
platforms = with stdenv.lib.platforms; linux ++ freebsd;
platforms = with stdenv.lib.platforms; linux ++ freebsd ++ darwin;
};
};
in {

4
pkgs/tools/system/cron/default.nix
View File

@@ -13,7 +13,7 @@ stdenv.mkDerivation {
preBuild = ''
substituteInPlace Makefile --replace ' -o root' ' ' --replace 111 755
makeFlags="DESTROOT=$out"
makeFlags="DESTROOT=$out CC=cc"
# We want to ignore the $glibc/include/paths.h definition of
# sendmail path.
@@ -35,6 +35,6 @@ stdenv.mkDerivation {
meta = {
description = "Daemon for running commands at specific times (Vixie Cron)";
platforms = stdenv.lib.platforms.linux;
platforms = with stdenv.lib.platforms; linux ++ darwin;
};
}

2
pkgs/tools/text/source-highlight/default.nix
View File

@@ -22,7 +22,7 @@ stdenv.mkDerivation {
description = "Source code renderer with syntax highlighting";
homepage = http://www.gnu.org/software/src-highlite/;
license = stdenv.lib.licenses.gpl3Plus;
platforms = stdenv.lib.platforms.linux;
platforms = with stdenv.lib.platforms; linux ++ darwin;
longDescription =
''
GNU Source-highlight, given a source file, produces a document