diff options
| author | Pascal Wittmann <mail@pascal-wittmann.de> | 2018-01-12 09:34:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-12 09:34:03 +0100 |
| commit | 459e6ba9fbcc4d756b25d6aab10d556b3e8aecb5 (patch) | |
| tree | b70e1c2c417ae212f16f90b4acf6b0e721ec6ede | |
| parent | 2832cc729a708ee2ddd1b562d79e4c62cba10b7a (diff) | |
| parent | 232ff39115b9d36c55d2c170e5d785b5247c6c8d (diff) | |
| download | nixlib-459e6ba9fbcc4d756b25d6aab10d556b3e8aecb5.tar nixlib-459e6ba9fbcc4d756b25d6aab10d556b3e8aecb5.tar.gz nixlib-459e6ba9fbcc4d756b25d6aab10d556b3e8aecb5.tar.bz2 nixlib-459e6ba9fbcc4d756b25d6aab10d556b3e8aecb5.tar.lz nixlib-459e6ba9fbcc4d756b25d6aab10d556b3e8aecb5.tar.xz nixlib-459e6ba9fbcc4d756b25d6aab10d556b3e8aecb5.tar.zst nixlib-459e6ba9fbcc4d756b25d6aab10d556b3e8aecb5.zip | |
Merge pull request #25713 from jbaum98/darwin-trash
darwin: trash 0.9.0
| -rw-r--r-- | pkgs/os-specific/darwin/trash/default.nix | 38 | ||||
| -rw-r--r-- | pkgs/os-specific/darwin/trash/trash.diff | 13 | ||||
| -rw-r--r-- | pkgs/top-level/darwin-packages.nix | 2 |
3 files changed, 53 insertions, 0 deletions
diff --git a/pkgs/os-specific/darwin/trash/default.nix b/pkgs/os-specific/darwin/trash/default.nix new file mode 100644 index 000000000000..4104d0d455ad --- /dev/null +++ b/pkgs/os-specific/darwin/trash/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, frameworks, perl } : +stdenv.mkDerivation rec { + version = "0.9.0"; + name = "trash-${version}"; + + src = fetchFromGitHub { + owner = "ali-rantakari"; + repo = "trash"; + rev = "f68ad25a02e24cc58eb8ef9a493d6dc0122bcd8f"; + sha256 = "0ylkf7jxfy1pj7i1s48w28kzqjdfd57m2pw0jycsgcj5bkzwll41"; + }; + + buildInputs = with frameworks; [ + Cocoa + AppKit + ScriptingBridge + perl + ]; + + patches = [ ./trash.diff ]; + + buildPhase = ''make all docs''; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share/man/man1 + install -m 0755 trash $out/bin + install -m 0444 trash.1 $out/share/man/man1 + ''; + + meta = { + homepage = https://github.com/ali-rantakari/trash; + description = "Small command-line program for OS X that moves files or + folders to the trash."; + platforms = stdenv.lib.platforms.darwin; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/os-specific/darwin/trash/trash.diff b/pkgs/os-specific/darwin/trash/trash.diff new file mode 100644 index 000000000000..546c760b10e3 --- /dev/null +++ b/pkgs/os-specific/darwin/trash/trash.diff @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index 5e4306f..9c975fc 100644 +--- a/Makefile ++++ b/Makefile +@@ -10,7 +10,7 @@ trash: $(SOURCE_FILES) + @echo + @echo ---- Compiling: + @echo ====================================== +- $(CC) -O2 -Wall -Wextra -Wpartial-availability -force_cpusubtype_ALL -mmacosx-version-min=10.7 -arch i386 -arch x86_64 -framework AppKit -framework ScriptingBridge -o $@ $(SOURCE_FILES) ++ $(CC) -O2 -Wall -Wextra -Wpartial-availability -force_cpusubtype_ALL -mmacosx-version-min=10.7 -arch x86_64 -framework AppKit -framework ScriptingBridge -o $@ $(SOURCE_FILES) + + analyze: + @echo diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 7540a47ef6d5..e75c9338f8d4 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -57,6 +57,8 @@ in swift-corefoundation = callPackage ../os-specific/darwin/swift-corefoundation { }; + trash = callPackage ../os-specific/darwin/trash { inherit (darwin.apple_sdk) frameworks; }; + usr-include = callPackage ../os-specific/darwin/usr-include { }; xcode = callPackage ../os-specific/darwin/xcode { }; |