diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-06-11 19:32:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-11 19:32:55 -0400 |
| commit | dba920840701889e1fe4184cf3b99ce99ae9f857 (patch) | |
| tree | 3dcff6fcac0d598a936ae0cf2a52e042a46842b5 /pkgs/os-specific/darwin | |
| parent | fdd75fc6f1d31aff21a4691e6cc8b5199f79934b (diff) | |
| parent | 6586effe962068c28eededaf11cce28ac06b70f6 (diff) | |
| download | nixpkgs-dba920840701889e1fe4184cf3b99ce99ae9f857.tar nixpkgs-dba920840701889e1fe4184cf3b99ce99ae9f857.tar.gz nixpkgs-dba920840701889e1fe4184cf3b99ce99ae9f857.tar.bz2 nixpkgs-dba920840701889e1fe4184cf3b99ce99ae9f857.tar.lz nixpkgs-dba920840701889e1fe4184cf3b99ce99ae9f857.tar.xz nixpkgs-dba920840701889e1fe4184cf3b99ce99ae9f857.tar.zst nixpkgs-dba920840701889e1fe4184cf3b99ce99ae9f857.zip | |
Merge pull request #62684 from bdesham/trash-0.9.2
trash: 0.9.1 -> 0.9.2
Diffstat (limited to 'pkgs/os-specific/darwin')
| -rw-r--r-- | pkgs/os-specific/darwin/trash/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/darwin/trash/trash.diff | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/os-specific/darwin/trash/default.nix b/pkgs/os-specific/darwin/trash/default.nix index e1606383c0d..4044ee4d0dd 100644 --- a/pkgs/os-specific/darwin/trash/default.nix +++ b/pkgs/os-specific/darwin/trash/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, perl, cf-private, AppKit, Cocoa, ScriptingBridge }: stdenv.mkDerivation rec { - version = "0.9.1"; + version = "0.9.2"; name = "trash-${version}"; src = fetchFromGitHub { owner = "ali-rantakari"; repo = "trash"; rev = "v${version}"; - sha256 = "0ylkf7jxfy1pj7i1s48w28kzqjdfd57m2pw0jycsgcj5bkzwll41"; + sha256 = "1d3rc03vgz32faj7qi18iiggxvxlqrj9lsk5jkpa9r1mcs5d89my"; }; buildInputs = [ diff --git a/pkgs/os-specific/darwin/trash/trash.diff b/pkgs/os-specific/darwin/trash/trash.diff index 546c760b10e..fa6edf98b3d 100644 --- a/pkgs/os-specific/darwin/trash/trash.diff +++ b/pkgs/os-specific/darwin/trash/trash.diff @@ -6,8 +6,8 @@ index 5e4306f..9c975fc 100644 @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) +- $(CC) -O2 -Wall -Wextra -Wpartial-availability -Wno-unguarded-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 -Wno-unguarded-availability -force_cpusubtype_ALL -mmacosx-version-min=10.7 -arch x86_64 -framework AppKit -framework ScriptingBridge -o $@ $(SOURCE_FILES) analyze: @echo |