status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move shellHook to respective Nix expressions

This commit is contained in:
Pedro Pombeiro 2019-05-07 15:51:28 +02:00
parent fca01891ba
commit 62614a71d9
No known key found for this signature in database
GPG Key ID: C4A24185B2AA48A1
5 changed files with 99 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nix/desktop/linux/base-image/default.nix
View File

@ -2,7 +2,8 @@
with pkgs; with pkgs;
stdenv.mkDerivation rec { let
package = stdenv.mkDerivation rec {
name = "StatusImAppImage"; name = "StatusImAppImage";
version = "20181208"; version = "20181208";
@ -29,4 +30,10 @@ stdenv.mkDerivation rec {
maintainers = [ stdenv.lib.maintainers.pombeirp ]; maintainers = [ stdenv.lib.maintainers.pombeirp ];
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
}; };
};
in package // {
shellHook = ''
export STATUSREACT_LINUX_BASEIMAGE_PATH="${package}/src"
'';
} }

7
nix/desktop/linux/default.nix
View File

@ -10,11 +10,8 @@ let
appimagekit = callPackage ./appimagekit { }; appimagekit = callPackage ./appimagekit { };
linuxdeployqt = callPackage ./linuxdeployqt { inherit appimagekit; }; linuxdeployqt = callPackage ./linuxdeployqt { inherit appimagekit; };
in in {
{
buildInputs = [ appimagekit linuxdeployqt patchelf baseImage ]; buildInputs = [ appimagekit linuxdeployqt patchelf baseImage ];
shellHook = '' inherit (baseImage) shellHook;
export STATUSREACT_LINUX_BASEIMAGE_PATH="${baseImage}/src"
'';
} }

9
nix/desktop/macos/base-image/default.nix
View File

@ -2,7 +2,8 @@
with pkgs; with pkgs;
stdenv.mkDerivation rec { let
package = stdenv.mkDerivation rec {
name = "StatusImAppBundle"; name = "StatusImAppBundle";
version = "20181113"; version = "20181113";
@ -29,4 +30,10 @@ stdenv.mkDerivation rec {
maintainers = [ stdenv.lib.maintainers.pombeirp ]; maintainers = [ stdenv.lib.maintainers.pombeirp ];
platforms = stdenv.lib.platforms.darwin; platforms = stdenv.lib.platforms.darwin;
}; };
};
in package // {
shellHook = ''
export STATUSREACT_MACOS_BASEIMAGE_PATH="${package}/src"
'';
} }

9
nix/desktop/windows/base-image/default.nix
View File

@ -4,7 +4,8 @@ with pkgs;
assert stdenv.isLinux; assert stdenv.isLinux;
stdenv.mkDerivation rec { let
package = stdenv.mkDerivation rec {
name = "StatusIm-Windows-base-image"; name = "StatusIm-Windows-base-image";
version = "20181113"; version = "20181113";
@ -39,4 +40,10 @@ stdenv.mkDerivation rec {
maintainers = [ stdenv.lib.maintainers.pombeirp ]; maintainers = [ stdenv.lib.maintainers.pombeirp ];
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
}; };
};
in package // {
shellHook = ''
export STATUSREACT_WINDOWS_BASEIMAGE_PATH="${package}/src"
'';
} }

2
nix/desktop/windows/default.nix
View File

@ -18,7 +18,7 @@ in
]; ];
shellHook = '' shellHook = ''
export STATUSREACT_WINDOWS_BASEIMAGE_PATH="${baseImage}/src" ${baseImage.shellHook}
unset QT_PATH unset QT_PATH
''; '';
} }