Ensure a consistent golang version is used throughout Nix
This commit is contained in:
parent
ea8bf402d7
commit
9b7b5b9608
|
@ -10,7 +10,7 @@ let
|
|||
gradle = pkgs.gradle_4_10;
|
||||
go = pkgs.go_1_11;
|
||||
buildGoPackage = pkgs.buildGoPackage.override { inherit go; };
|
||||
statusDesktop = pkgs.callPackage ./nix/desktop { inherit target-os status-go pkgs; inherit (pkgs) darwin; stdenv = stdenv'; nodejs = nodejs'; };
|
||||
statusDesktop = pkgs.callPackage ./nix/desktop { inherit target-os status-go pkgs go; inherit (pkgs) darwin; stdenv = stdenv'; nodejs = nodejs'; };
|
||||
statusMobile = pkgs.callPackage ./nix/mobile { inherit target-os config pkgs status-go gradle; inherit (pkgs.xcodeenv) composeXcodeWrapper; stdenv = stdenv'; nodejs = nodejs'; };
|
||||
status-go = pkgs.callPackage ./nix/status-go { inherit target-os go buildGoPackage; inherit (pkgs.xcodeenv) composeXcodeWrapper; inherit (statusMobile) xcodewrapperArgs; androidPkgs = statusMobile.androidComposition; };
|
||||
nodejs' = pkgs.nodejs-10_x;
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, pkgs, callPackage, target-os,
|
||||
cmake, extra-cmake-modules, file, status-go,
|
||||
cmake, extra-cmake-modules, file, status-go, go,
|
||||
darwin, nodejs }:
|
||||
|
||||
with stdenv;
|
||||
|
@ -8,7 +8,7 @@ let
|
|||
platform = callPackage ../platform.nix { inherit target-os; };
|
||||
linuxPlatform = callPackage ./linux { inherit status-go; };
|
||||
darwinPlatform = callPackage ./macos { inherit status-go darwin; };
|
||||
windowsPlatform = callPackage ./windows { };
|
||||
windowsPlatform = callPackage ./windows { inherit go; };
|
||||
snoreNotifySources = callPackage ./cmake/snorenotify { };
|
||||
qtkeychainSources = callPackage ./cmake/qtkeychain { };
|
||||
selectedSources =
|
||||
|
@ -20,8 +20,7 @@ let
|
|||
inherit pkgs nodejs;
|
||||
};
|
||||
|
||||
in
|
||||
{
|
||||
in {
|
||||
buildInputs = [
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
|
@ -32,4 +31,4 @@ in
|
|||
++ (builtins.attrValues nodeInputs);
|
||||
|
||||
shellHook = lib.concatStrings (lib.catAttrs "shellHook" (selectedSources ++ [ snoreNotifySources qtkeychainSources ]));
|
||||
}
|
||||
}
|
||||
|
|
|
@ -7,7 +7,7 @@ with stdenv;
|
|||
let
|
||||
platform = callPackage ../platform.nix { inherit target-os; };
|
||||
utils = callPackage ../utils.nix { inherit xcodeWrapper; };
|
||||
gomobile = callPackage ./gomobile { inherit (androidPkgs) platform-tools; inherit buildGoPackage composeXcodeWrapper xcodewrapperArgs utils; };
|
||||
gomobile = callPackage ./gomobile { inherit (androidPkgs) platform-tools; inherit composeXcodeWrapper xcodewrapperArgs utils buildGoPackage; };
|
||||
buildStatusGoDesktopLib = callPackage ./build-desktop-status-go.nix { inherit buildGoPackage go xcodeWrapper utils; };
|
||||
buildStatusGoMobileLib = callPackage ./build-mobile-status-go.nix { inherit buildGoPackage go gomobile xcodeWrapper utils; };
|
||||
extractStatusGoConfig = f: lib.last (lib.splitString "\n" (lib.fileContents f));
|
||||
|
|
Loading…
Reference in New Issue