diff options
| author | adisbladis <adisbladis@gmail.com> | 2018-09-19 15:47:23 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-19 15:47:23 +0800 |
| commit | 9cc7be6639d74fa0cc63f36d1cc398f28edf257e (patch) | |
| tree | c703e6b5e763174df0ac974e265a2dd5db38268d | |
| parent | 71c43f8c4a8b26026a3e837c77026926c53a9a92 (diff) | |
| parent | 4c56eb81e9522c74b85f2aadf14f619288191dad (diff) | |
| download | nixlib-9cc7be6639d74fa0cc63f36d1cc398f28edf257e.tar nixlib-9cc7be6639d74fa0cc63f36d1cc398f28edf257e.tar.gz nixlib-9cc7be6639d74fa0cc63f36d1cc398f28edf257e.tar.bz2 nixlib-9cc7be6639d74fa0cc63f36d1cc398f28edf257e.tar.lz nixlib-9cc7be6639d74fa0cc63f36d1cc398f28edf257e.tar.xz nixlib-9cc7be6639d74fa0cc63f36d1cc398f28edf257e.tar.zst nixlib-9cc7be6639d74fa0cc63f36d1cc398f28edf257e.zip | |
Merge pull request #46877 from marsam/feature/fix-noti-darwin
noti: fix darwin build
| -rw-r--r-- | pkgs/tools/misc/noti/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/tools/misc/noti/default.nix b/pkgs/tools/misc/noti/default.nix index ac5b4199c216..23646abe7875 100644 --- a/pkgs/tools/misc/noti/default.nix +++ b/pkgs/tools/misc/noti/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, Cocoa }: buildGoPackage rec { name = "noti-${version}"; @@ -11,6 +11,10 @@ buildGoPackage rec { 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"; preBuild = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 07133473b808..f0ba3a1552e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1467,7 +1467,9 @@ with pkgs; 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 { }; |