diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2016-11-09 22:24:59 -0600 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2016-11-15 18:58:11 -0600 |
commit | a35b330f30d0138ff5e4a86c7afdcc7c7e311fea (patch) | |
tree | 4073352b489f3a5aadefbcb3b5e784b2c3128ff0 /pkgs/os-specific/darwin/apple-source-releases | |
parent | 1ee8685ee73b8867810e9a309d106019f11be0f7 (diff) | |
download | nixpkgs-a35b330f30d0138ff5e4a86c7afdcc7c7e311fea.tar nixpkgs-a35b330f30d0138ff5e4a86c7afdcc7c7e311fea.tar.gz nixpkgs-a35b330f30d0138ff5e4a86c7afdcc7c7e311fea.tar.bz2 nixpkgs-a35b330f30d0138ff5e4a86c7afdcc7c7e311fea.tar.lz nixpkgs-a35b330f30d0138ff5e4a86c7afdcc7c7e311fea.tar.xz nixpkgs-a35b330f30d0138ff5e4a86c7afdcc7c7e311fea.tar.zst nixpkgs-a35b330f30d0138ff5e4a86c7afdcc7c7e311fea.zip |
adv_cmds: move from all-packages
Use the old way with pkgs/os-specific/darwin/apple-source-releases/defuault.nix.
Diffstat (limited to 'pkgs/os-specific/darwin/apple-source-releases')
-rw-r--r-- | pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix | 27 | ||||
-rw-r--r-- | pkgs/os-specific/darwin/apple-source-releases/default.nix | 2 |
2 files changed, 16 insertions, 13 deletions
diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix index 7857a59161c..15160e02e14 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix @@ -1,14 +1,7 @@ -{ stdenv, fetchurl, xcbuild, libcxx }: +{ stdenv, appleDerivation, fetchurl, xcbuild, libcxx }: -stdenv.mkDerivation { - name = "adv_cmds"; - - src = fetchurl { - url = "https://opensource.apple.com/tarballs/adv_cmds/adv_cmds-163.tar.gz"; - sha256 = "12gbv35i09aij9g90p6b3x2f3ramw43qcb2gjrg8lzkzmwvcyw9q"; - }; - - # remove pkill from build +appleDerivation { + # disable pkill from build patchPhase = '' substituteInPlace adv_cmds.xcodeproj/project.pbxproj \ --replace "FD201DC214369B4200906237 /* pkill.c in Sources */," "" @@ -17,11 +10,19 @@ stdenv.mkDerivation { # temporary install phase until xcodebuild has "install" support installPhase = '' mkdir -p $out/bin/ + install adv_cmds-*/Build/Products/Release-*/* $out/bin/ - for cmd in cap_mkdb finger fingerd gencat last locale lsvfs ps stty tabs tty whois - do - install adv_cmds-*/Build/Products/Release-*/$cmd $out/bin/$cmd + for n in 1 8; do + mkdir -p $out/share/man/man$n + install */*.$n $out/share/man/man$n done + + mkdir -p $out/System/Library/LaunchDaemons + install fingerd/finger.plist $out/System/Library/LaunchDaemons + + # from variant_links.sh + # ln -s $out/bin/pkill $out/bin/pgrep + # ln -s $out/share/man/man1/pkill.1 $out/share/man/man1/pgrep.1 ''; buildInputs = [ xcbuild libcxx ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 2ebb8868a2e..2f49330ed59 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -33,6 +33,7 @@ let libutil = "43"; libunwind = "35.3"; + adv_cmds = "163"; }; "osx-10.11.5" = { Libc = "1082.50.1"; # 10.11.6 still unreleased :/ @@ -213,6 +214,7 @@ let removefile = applePackage "removefile" "osx-10.11.6" "1b6r74ry3k01kypvlaclf33fha15pcm0kzx9zrymlg66wg0s0i3r" {}; Security = applePackage "Security" "osx-10.9.5" "1nv0dczf67dhk17hscx52izgdcyacgyy12ag0jh6nl5hmfzsn8yy" {}; xnu = applePackage "xnu" "osx-10.11.6" "0yhziq4dqqcbjpf6vyqn8xhwva2zb525gndkx8cp8alzwp76jnr9" {}; + adv_cmds = applePackage "adv_cmds/xcode.nix" "osx-10.11.6" "12gbv35i09aij9g90p6b3x2f3ramw43qcb2gjrg8lzkzmwvcyw9q" {}; libsecurity_apple_csp = libsecPackage "libsecurity_apple_csp" "osx-10.7.5" "1ngyn1ik27n4x981px3kfd1z1n8zx7r5w812b6qfjpy5nw4h746w" {}; libsecurity_apple_cspdl = libsecPackage "libsecurity_apple_cspdl" "osx-10.7.5" "1svqa5fhw7p7njzf8bzg7zgc5776aqjhdbnlhpwmr5hmz5i0x8r7" {}; |