public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests 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
parent 3d69037956 c7abef4c5d
commit 43be4ebfb1
11 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/all-packages.nix
+6 -2
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;