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

Merge pull request #46877 from marsam/feature/fix-noti-darwin 

noti: fix darwin build
This commit is contained in:
adisbladis 2018-09-19 15:47:23 +08:00 committed by GitHub
parent 71c43f8c4a 4c56eb81e9
commit 9cc7be6639
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/misc/noti/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildGoPackage, fetchFromGitHub }: { stdenv, buildGoPackage, fetchFromGitHub, Cocoa }:
buildGoPackage rec { buildGoPackage rec {
name = "noti-${version}"; name = "noti-${version}";
@ -11,6 +11,10 @@ buildGoPackage rec {
sha256 = "1chsqfqk0pnhx5k2nr4c16cpb8m6zv69l1jvv4v4903zgfzcm823"; sha256 = "1chsqfqk0pnhx5k2nr4c16cpb8m6zv69l1jvv4v4903zgfzcm823";
}; };
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Cocoa ];
# TODO: Remove this when we update apple_sdk
NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.isDarwin [ "-fno-objc-arc" ];
goPackagePath = "github.com/variadico/noti"; goPackagePath = "github.com/variadico/noti";
preBuild = '' preBuild = ''

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

@ -1467,7 +1467,9 @@ with pkgs;
noteshrink = callPackage ../tools/misc/noteshrink { }; noteshrink = callPackage ../tools/misc/noteshrink { };
noti = callPackage ../tools/misc/noti { }; noti = callPackage ../tools/misc/noti {
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
nrsc5 = callPackage ../applications/misc/nrsc5 { }; nrsc5 = callPackage ../applications/misc/nrsc5 { };