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

Merge pull request #62684 from bdesham/trash-0.9.2

Browse Source 
trash: 0.9.1 -> 0.9.2
This commit is contained in:
Matthew Bauer 2019-06-11 19:32:55 -04:00 committed by GitHub
commit dba9208407
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/os-specific/darwin/trash/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, perl, cf-private, AppKit, Cocoa, ScriptingBridge }: { stdenv, fetchFromGitHub, perl, cf-private, AppKit, Cocoa, ScriptingBridge }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.9.1"; version = "0.9.2";
name = "trash-${version}"; name = "trash-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ali-rantakari"; owner = "ali-rantakari";
repo = "trash"; repo = "trash";
rev = "v${version}"; rev = "v${version}";
sha256 = "0ylkf7jxfy1pj7i1s48w28kzqjdfd57m2pw0jycsgcj5bkzwll41"; sha256 = "1d3rc03vgz32faj7qi18iiggxvxlqrj9lsk5jkpa9r1mcs5d89my";
}; };
buildInputs = [ buildInputs = [

4
pkgs/os-specific/darwin/trash/trash.diff
View File

@ -6,8 +6,8 @@ index 5e4306f..9c975fc 100644
@echo @echo
@echo ---- Compiling: @echo ---- Compiling:
@echo ====================================== @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 -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 -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 x86_64 -framework AppKit -framework ScriptingBridge -o $@ $(SOURCE_FILES)
analyze: analyze:
@echo @echo