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

adv_cmds: move from all-packages

Browse Source 
Use the old way with pkgs/os-specific/darwin/apple-source-releases/defuault.nix.
This commit is contained in:
Matthew Bauer 2016-11-09 22:24:59 -06:00
parent 1ee8685ee7
commit a35b330f30
No known key found for this signature in database
GPG Key ID: E04D0AD9469141C3
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix
View File

@ -1,14 +1,7 @@
{ stdenv, fetchurl, xcbuild, libcxx }: { stdenv, appleDerivation, fetchurl, xcbuild, libcxx }:
stdenv.mkDerivation { appleDerivation {
name = "adv_cmds"; # disable pkill from build
src = fetchurl {
url = "https://opensource.apple.com/tarballs/adv_cmds/adv_cmds-163.tar.gz";
sha256 = "12gbv35i09aij9g90p6b3x2f3ramw43qcb2gjrg8lzkzmwvcyw9q";
};
# remove pkill from build
patchPhase = '' patchPhase = ''
substituteInPlace adv_cmds.xcodeproj/project.pbxproj \ substituteInPlace adv_cmds.xcodeproj/project.pbxproj \
--replace "FD201DC214369B4200906237 /* pkill.c in Sources */," "" --replace "FD201DC214369B4200906237 /* pkill.c in Sources */," ""
@ -17,11 +10,19 @@ stdenv.mkDerivation {
# temporary install phase until xcodebuild has "install" support # temporary install phase until xcodebuild has "install" support
installPhase = '' installPhase = ''
mkdir -p $out/bin/ 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 for n in 1 8; do
do mkdir -p $out/share/man/man$n
install adv_cmds-*/Build/Products/Release-*/$cmd $out/bin/$cmd install */*.$n $out/share/man/man$n
done 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 ]; buildInputs = [ xcbuild libcxx ];

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

@ -33,6 +33,7 @@ let
libutil = "43"; libutil = "43";
libunwind = "35.3"; libunwind = "35.3";
adv_cmds = "163";
}; };
"osx-10.11.5" = { "osx-10.11.5" = {
Libc = "1082.50.1"; # 10.11.6 still unreleased :/ Libc = "1082.50.1"; # 10.11.6 still unreleased :/
@ -213,6 +214,7 @@ let
removefile = applePackage "removefile" "osx-10.11.6" "1b6r74ry3k01kypvlaclf33fha15pcm0kzx9zrymlg66wg0s0i3r" {}; removefile = applePackage "removefile" "osx-10.11.6" "1b6r74ry3k01kypvlaclf33fha15pcm0kzx9zrymlg66wg0s0i3r" {};
Security = applePackage "Security" "osx-10.9.5" "1nv0dczf67dhk17hscx52izgdcyacgyy12ag0jh6nl5hmfzsn8yy" {}; Security = applePackage "Security" "osx-10.9.5" "1nv0dczf67dhk17hscx52izgdcyacgyy12ag0jh6nl5hmfzsn8yy" {};
xnu = applePackage "xnu" "osx-10.11.6" "0yhziq4dqqcbjpf6vyqn8xhwva2zb525gndkx8cp8alzwp76jnr9" {}; 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_csp = libsecPackage "libsecurity_apple_csp" "osx-10.7.5" "1ngyn1ik27n4x981px3kfd1z1n8zx7r5w812b6qfjpy5nw4h746w" {};
libsecurity_apple_cspdl = libsecPackage "libsecurity_apple_cspdl" "osx-10.7.5" "1svqa5fhw7p7njzf8bzg7zgc5776aqjhdbnlhpwmr5hmz5i0x8r7" {}; libsecurity_apple_cspdl = libsecPackage "libsecurity_apple_cspdl" "osx-10.7.5" "1svqa5fhw7p7njzf8bzg7zgc5776aqjhdbnlhpwmr5hmz5i0x8r7" {};

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

@ -17377,6 +17377,4 @@ in
xulrunner = firefox-unwrapped; xulrunner = firefox-unwrapped;
nitrokey-app = callPackage ../tools/security/nitrokey-app { }; nitrokey-app = callPackage ../tools/security/nitrokey-app { };
adv_cmds = callPackage ../os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix {};
} }