alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

relocate adv_cmds

Browse source
This commit is contained in:
Jude Taylor 2015-06-17 20:52:27 -07:00
parent fa9c81f694
commit ee951a92d3
4 changed files with 15 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
pkgs/os-specific/darwin/adv_cmds/locale.nix
View file

@ -1,29 +0,0 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "locale-${version}";
version = "153";
src = fetchurl {
url = "http://opensource.apple.com/tarballs/adv_cmds/adv_cmds-${version}.tar.gz";
sha256 = "174v6a4zkcm2pafzgdm6kvs48z5f911zl7k49hv7kjq6gm58w99v";
};
buildPhase = ''
cd locale
c++ -Os -Wall -o locale locale.cc
'';
installPhase = ''
mkdir -p $out/bin $out/share/man/man1
cp locale $out/bin/locale
cp locale.1 $out/share/man/man1
'';
meta = {
platforms = stdenv.lib.platforms.darwin;
maintainers = with stdenv.lib.maintainers; [ gridaphobe ];
};
}

35
pkgs/os-specific/darwin/adv_cmds/ps.nix
View file

@ -1,35 +0,0 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "ps-${version}";
version = "153";
src = fetchurl {
url = "http://opensource.apple.com/tarballs/adv_cmds/adv_cmds-${version}.tar.gz";
sha256 = "174v6a4zkcm2pafzgdm6kvs48z5f911zl7k49hv7kjq6gm58w99v";
};
buildPhase = ''
cd ps
cc -Os -Wall -I. -c -o fmt.o fmt.c
cc -Os -Wall -I. -c -o keyword.o keyword.c
cc -Os -Wall -I. -c -o nlist.o nlist.c
cc -Os -Wall -I. -c -o print.o print.c
cc -Os -Wall -I. -c -o ps.o ps.c
cc -Os -Wall -I. -c -o tasks.o tasks.c
cc -o ps fmt.o keyword.o nlist.o print.o ps.o tasks.o
'';
installPhase = ''
mkdir -p $out/bin $out/share/man/man1
cp ps $out/bin/ps
cp ps.1 $out/share/man/man1
'';
meta = {
platforms = stdenv.lib.platforms.darwin;
maintainers = with stdenv.lib.maintainers; [ gridaphobe ];
};
}

15
pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix
View file

@ -2,10 +2,8 @@
appleDerivation {
# Will override the name until we provide all of adv_cmds
name = "ps-${version}";
buildPhase = ''
cd ps
pushd ps
cc -Os -Wall -I. -c -o fmt.o fmt.c
cc -Os -Wall -I. -c -o keyword.o keyword.c
cc -Os -Wall -I. -c -o nlist.o nlist.c
@ -13,13 +11,20 @@ appleDerivation {
cc -Os -Wall -I. -c -o ps.o ps.c
cc -Os -Wall -I. -c -o tasks.o tasks.c
cc -o ps fmt.o keyword.o nlist.o print.o ps.o tasks.o
popd
pushd locale
c++ -o locale locale.cc
popd
'';
installPhase = ''
mkdir -p $out/bin $out/share/man/man1
cp ps $out/bin/ps
cp ps.1 $out/share/man/man1
cp ps/ps $out/bin/ps
cp ps/ps.1 $out/share/man/man1
cp locale/locale $out/bin/locale
cp locale/locale.1 $out/share/man/man1
'';

12
pkgs/top-level/all-packages.nix
View file

@ -1512,7 +1512,9 @@ let
garmintools = callPackage ../development/libraries/garmintools {};
gawk = callPackage ../tools/text/gawk { inherit (darwin) locale; };
gawk = callPackage ../tools/text/gawk {
locale = darwin.adv_cmds;
};
gawkInteractive = appendToName "interactive"
(gawk.override { readlineSupport = true; });
@ -5282,12 +5284,12 @@ let
cmake-2_8 = callPackage ../development/tools/build-managers/cmake/2.8.nix {
wantPS = stdenv.isDarwin;
ps = if stdenv.isDarwin then darwin.ps else null;
ps = if stdenv.isDarwin then darwin.adv_cmds else null;
};
cmake = callPackage ../development/tools/build-managers/cmake {
wantPS = stdenv.isDarwin;
ps = if stdenv.isDarwin then darwin.ps else null;
ps = if stdenv.isDarwin then darwin.adv_cmds else null;
};
cmakeCurses = cmake.override { useNcurses = true; };
@ -9294,10 +9296,6 @@ let
osx_sdk = callPackage ../os-specific/darwin/osx-sdk {};
osx_private_sdk = callPackage ../os-specific/darwin/osx-private-sdk { inherit osx_sdk; };
ps = callPackage ../os-specific/darwin/adv_cmds/ps.nix {};
locale = callPackage ../os-specific/darwin/adv_cmds/locale.nix {};
security_tool = callPackage ../os-specific/darwin/security-tool { inherit osx_private_sdk; };
binutils = callPackage ../os-specific/darwin/binutils { inherit cctools; };