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

View File

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

View File

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

View File

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

View File

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

View File

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