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

Revert "Merge pull request #83099 from marsam/fix-buildGoModule-packages-darwin"

Browse Source 
This reverts commit 4e6bf03504, reversing
changes made to afd997aab6.

Instead we propagate those frameworks from the compiler again
This commit is contained in:
Jörg Thalheim
2020-03-27 07:33:21 +00:00
parent 0bba7474b3
commit 066db11215
133 changed files with 443 additions and 861 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/dive/default.nix
+2 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, pkg-config, btrfs-progs, gpgme, lvm2, Security }:
{ stdenv, buildGoModule, fetchFromGitHub, pkg-config, btrfs-progs, gpgme, lvm2 }:
buildGoModule rec {
pname = "dive";
@@ -15,8 +15,7 @@ buildGoModule rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = stdenv.lib.optionals stdenv.isLinux [ btrfs-progs gpgme lvm2 ]
++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
buildInputs = stdenv.lib.optionals stdenv.isLinux [ btrfs-progs gpgme lvm2 ];
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];