status-im/status-mobile
2
0
Fork 0
mirror of https://github.com/status-im/status-mobile.git synced 2025-01-13 10:16:01 +00:00
Code Issues Projects Releases Wiki Activity

Move shellHook to status-go package

Browse Source 
Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
This commit is contained in:
Pedro Pombeiro 2019-04-12 09:38:08 +02:00
parent 8e6b8b1ff1
commit d453e510a2
No known key found for this signature in database
GPG Key ID: C4A24185B2AA48A1
2 changed files with 81 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
derivation.nix
View File

@ -26,7 +26,7 @@ with pkgs;
# TODO: Try to use stdenv for iOS. The problem is with building iOS as the build is trying to pass parameters to Apple's ld that are meant for GNU's ld (e.g. -dynamiclib) # TODO: Try to use stdenv for iOS. The problem is with building iOS as the build is trying to pass parameters to Apple's ld that are meant for GNU's ld (e.g. -dynamiclib)
_stdenv = stdenvNoCC; _stdenv = stdenvNoCC;
statusDesktop = callPackage ./nix/desktop { inherit target-os; stdenv = _stdenv; }; statusDesktop = callPackage ./nix/desktop { inherit target-os; stdenv = _stdenv; };
statusMobile = callPackage ./nix/mobile { inherit target-os config status-go; stdenv = _stdenv; }; statusMobile = callPackage ./nix/mobile { inherit target-os config; status-go = status-go.package; stdenv = _stdenv; };
status-go = callPackage ./nix/status-go { inherit (xcodeenv) composeXcodeWrapper; inherit (statusMobile) xcodewrapperArgs; androidPkgs = statusMobile.androidComposition; }; status-go = callPackage ./nix/status-go { inherit (xcodeenv) composeXcodeWrapper; inherit (statusMobile) xcodewrapperArgs; androidPkgs = statusMobile.androidComposition; };
nodejs' = pkgs.nodejs-10_x; nodejs' = pkgs.nodejs-10_x;
yarn' = yarn.override { nodejs = nodejs'; }; yarn' = yarn.override { nodejs = nodejs'; };
@ -50,7 +50,7 @@ with pkgs;
maven maven
watchman watchman
status-go status-go.package
] ++ nodePkgBuildInputs ] ++ nodePkgBuildInputs
++ lib.optional isDarwin cocoapods ++ lib.optional isDarwin cocoapods
++ lib.optional (!isDarwin) gcc7 ++ lib.optional (!isDarwin) gcc7
@ -58,11 +58,6 @@ with pkgs;
++ lib.optionals targetMobile statusMobile.buildInputs; ++ lib.optionals targetMobile statusMobile.buildInputs;
shellHook = shellHook =
status-go.shellHook + status-go.shellHook +
''
export STATUS_GO_INCLUDEDIR=${status-go}/include
export STATUS_GO_LIBDIR=${status-go}/lib
export STATUS_GO_BINDIR=${status-go.bin}/bin
'' +
lib.optionalString targetDesktop statusDesktop.shellHook + lib.optionalString targetDesktop statusDesktop.shellHook +
lib.optionalString targetMobile statusMobile.shellHook; lib.optionalString targetMobile statusMobile.shellHook;
hardeningDisable = status-go.hardeningDisable; hardeningDisable = status-go.hardeningDisable;

14
nix/status-go/default.nix
View File

@ -62,8 +62,7 @@ let
goBuildFlags = "-v"; goBuildFlags = "-v";
goBuildLdFlags = "-ldflags=-s"; goBuildLdFlags = "-ldflags=-s";
xcodeWrapper = composeXcodeWrapper xcodewrapperArgs; xcodeWrapper = composeXcodeWrapper xcodewrapperArgs;
status-go = buildGoPackage rec {
in buildGoPackage rec {
inherit goPackagePath version rev; inherit goPackagePath version rev;
name = "${repo}-${version}"; name = "${repo}-${version}";
@ -152,4 +151,15 @@ in buildGoPackage rec {
maintainers = with lib.maintainers; [ pombeirp ]; maintainers = with lib.maintainers; [ pombeirp ];
platforms = with lib.platforms; linux ++ darwin; platforms = with lib.platforms; linux ++ darwin;
}; };
};
in {
package = status-go;
hardeningDisable = status-go.hardeningDisable;
shellHook =
''
export STATUS_GO_INCLUDEDIR=${status-go}/include
export STATUS_GO_LIBDIR=${status-go}/lib
export STATUS_GO_BINDIR=${status-go.bin}/bin
'';
} }