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

Merge pull request #36581 from matthewbauer/darwin-fixes

Browse Source 
darwin: fixes
This commit is contained in:
Daiderd Jordan 2018-03-09 19:32:54 +01:00 committed by GitHub
commit 43be4ebfb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/misc/apvlv/default.nix
View File

@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
'';
license = licenses.lgpl2;
platforms = platforms.unix;
platforms = platforms.linux;
maintainers = [ maintainers.ardumont ];
};

2
pkgs/applications/misc/bb/default.nix
View File

@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
description = "AA-lib demo";
license = licenses.gpl2;
maintainers = [ maintainers.rnhmjoj ];
platforms = platforms.unix;
platforms = platforms.linux;
};
}

2
pkgs/applications/misc/confclerk/default.nix
View File

@ -23,6 +23,6 @@ stdenv.mkDerivation {
homepage = http://www.toastfreeware.priv.at/confclerk;
license = stdenv.lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [ ehmry ];
inherit (qt4.meta) platforms;
platforms = stdenv.lib.platforms.linux;
};
}

2
pkgs/applications/science/math/bcal/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ python3Packages.pytest ];
doCheck = true;
doCheck = !stdenv.isDarwin;
checkPhase = ''
python3 -m pytest test.py
'';

2
pkgs/development/libraries/cmark/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake ];
doCheck = true;
doCheck = !stdenv.isDarwin;
checkPhase = ''
export LD_LIBRARY_PATH=$(readlink -f ./src)
CTEST_OUTPUT_ON_FAILURE=1 make test

2
pkgs/development/misc/avr/gcc/default.nix
View File

@ -54,7 +54,7 @@ stdenv.mkDerivation {
description = "GNU Compiler Collection, version ${version} for AVR microcontrollers";
homepage = http://gcc.gnu.org;
license = licenses.gpl3Plus;
platforms = platforms.unix;
platforms = platforms.linux;
maintainers = with maintainers; [ mguentner ];
};
}

6
pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix
View File

@ -7,11 +7,13 @@ appleDerivation rec {
# "spray" requires some files that aren't compiling correctly in xcbuild.
# "rtadvd" seems to fail with some missing constants.
# We disable spray and rtadvd here for now.
# "traceroute6" and "ping6" require ipsec which doesn't build correctly
patchPhase = ''
substituteInPlace network_cmds.xcodeproj/project.pbxproj \
--replace "7294F0EA0EE8BAC80052EC88 /* PBXTargetDependency */," "" \
--replace "7216D34D0EE89FEC00AE70E4 /* PBXTargetDependency */," ""
--replace "7216D34D0EE89FEC00AE70E4 /* PBXTargetDependency */," "" \
--replace "72CD1D9C0EE8C47C005F825D /* PBXTargetDependency */," "" \
--replace "7216D2C20EE89ADF00AE70E4 /* PBXTargetDependency */," ""
'';
# temporary install phase until xcodebuild has "install" support

4
pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix
View File

@ -10,10 +10,12 @@ appleDerivation rec {
# - su ('security/pam_appl.h' file not found)
# - find (Undefined symbol '_get_date')
# - w (Undefined symbol '_res_9_init')
# - expr
substituteInPlace shell_cmds.xcodeproj/project.pbxproj \
--replace "FCBA168714A146D000AA698B /* PBXTargetDependency */," "" \
--replace "FCBA165914A146D000AA698B /* PBXTargetDependency */," "" \
--replace "FCBA169514A146D000AA698B /* PBXTargetDependency */," ""
--replace "FCBA169514A146D000AA698B /* PBXTargetDependency */," "" \
--replace "FCBA165514A146D000AA698B /* PBXTargetDependency */," ""
# disable w, test install
# get rid of permission stuff

2
pkgs/tools/backup/bdsync/default.nix
View File

@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
description = "Fast block device synchronizing tool";
homepage = https://github.com/TargetHolding/bdsync;
license = licenses.gpl2;
platforms = platforms.all;
platforms = platforms.linux;
maintainers = with maintainers; [ jluttine ];
};

2
pkgs/tools/misc/cutecom/default.nix
View File

@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
homepage = http://cutecom.sourceforge.net/;
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.bennofs ];
platforms = stdenv.lib.platforms.unix;
platforms = stdenv.lib.platforms.linux;
};
}

8
pkgs/top-level/all-packages.nix
View File

@ -12283,7 +12283,9 @@ with pkgs;
knot-dns = callPackage ../servers/dns/knot-dns { };
knot-resolver = callPackage ../servers/dns/knot-resolver {
# TODO: vimNox after it gets fixed on Darwin or something lighter
hexdump = if stdenv.isLinux then utillinux.bin else vim/*xxd*/;
hexdump = if stdenv.isLinux then utillinux.bin
else if stdenv.isDarwin then darwin.shell_cmds
else vim/*xxd*/;
};
rdkafka = callPackage ../development/libraries/rdkafka { };
@ -19904,7 +19906,9 @@ with pkgs;
pcalc = callPackage ../applications/science/math/pcalc { };
bcal = callPackage ../applications/science/math/bcal { };
bcal = callPackage ../applications/science/math/bcal {
stdenv = gccStdenv;
};
pspp = callPackage ../applications/science/math/pspp {
inherit (gnome3) gtksourceview;