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

otool and setfile: cleanup

Browse Source
This commit is contained in:
Jason "Don" O'Conal 2013-07-07 18:54:33 +10:00
parent da7db90068
commit 525a6856f2
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/wxGTK-2.9/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto { stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
, gstreamer, gst_plugins_base, GConf, setFile , gstreamer, gst_plugins_base, GConf, setfile
, withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true, , withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true,
}: }:
@ -22,7 +22,7 @@ stdenv.mkDerivation {
[ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer
gst_plugins_base GConf ] gst_plugins_base GConf ]
++ optional withMesa mesa ++ optional withMesa mesa
++ optional stdenv.isDarwin setFile; ++ optional stdenv.isDarwin setfile;
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
@ -45,7 +45,7 @@ stdenv.mkDerivation {
" + optionalString stdenv.isDarwin '' " + optionalString stdenv.isDarwin ''
substituteInPlace configure --replace \ substituteInPlace configure --replace \
'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' \ 'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' \
'ac_cv_prog_SETFILE="${setFile}/bin/SetFile"' 'ac_cv_prog_SETFILE="${setfile}/bin/SetFile"'
''; '';
postInstall = " postInstall = "

3
pkgs/development/tools/misc/otool/default.nix → pkgs/os-specific/darwin/otool/default.nix
View File

@ -14,12 +14,13 @@ stdenv.mkDerivation {
installPhase = '' installPhase = ''
mkdir -p "$out/bin" mkdir -p "$out/bin"
cp /usr/bin/otool "$out/bin" ln -s $src "$out/bin"
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Object file displaying tool"; description = "Object file displaying tool";
homepage = https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man1/otool.1.html; homepage = https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man1/otool.1.html;
license = licenses.unfree;
maintainers = with maintainers; [ lovek323 ]; maintainers = with maintainers; [ lovek323 ];
platforms = platforms.darwin; platforms = platforms.darwin;

5
pkgs/development/tools/misc/setFile/default.nix → pkgs/os-specific/darwin/setfile/default.nix
View File

@ -4,7 +4,7 @@
assert stdenv.isDarwin; assert stdenv.isDarwin;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "setFile"; name = "setfile";
src = "/usr/bin/SetFile"; src = "/usr/bin/SetFile";
@ -14,12 +14,13 @@ stdenv.mkDerivation {
installPhase = '' installPhase = ''
mkdir -p "$out/bin" mkdir -p "$out/bin"
cp $src "$out/bin" ln -s $src "$out/bin"
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Set attributes of files and directories"; description = "Set attributes of files and directories";
homepage = "http://developer.apple.com/library/mac/#documentation/Darwin/Reference/ManPages/man1/setfile.1.html"; homepage = "http://developer.apple.com/library/mac/#documentation/Darwin/Reference/ManPages/man1/setfile.1.html";
license = licenses.unfree;
maintainers = with maintainers; [ lovek323 ]; maintainers = with maintainers; [ lovek323 ];
platforms = platforms.darwin; platforms = platforms.darwin;

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

@ -444,9 +444,9 @@ let
apg = callPackage ../tools/security/apg { }; apg = callPackage ../tools/security/apg { };
otool = callPackage ../development/tools/misc/otool { }; otool = callPackage ../os-specific/darwin/otool { };
setFile = callPackage ../development/tools/misc/setFile { }; setfile = callPackage ../os-specific/darwin/setfile { };
xcodeenv = callPackage ../development/mobile/xcodeenv { }; xcodeenv = callPackage ../development/mobile/xcodeenv { };