eeva/gRPC-haskell
1
0
Fork 0
mirror of https://github.com/unclechu/gRPC-haskell.git synced 2024-11-17 00:29:42 +01:00
Code Issues Projects Releases Wiki Activity

Factor out shell-hook-common

Browse source
This commit is contained in:
Joel Stanley 2021-06-29 08:52:26 -05:00
parent c92a053981
commit e80dd2ff31
No known key found for this signature in database
GPG key ID: F368244CDC80C97F
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
release.nix
View file

@ -75,7 +75,7 @@ let
allowBroken = true; allowBroken = true;
}; };
overlay = pkgsNew: pkgsOld: { overlay = pkgsNew: pkgsOld: rec {
grpc = pkgsNew.callPackage ./nix/grpc.nix { }; grpc = pkgsNew.callPackage ./nix/grpc.nix { };
@ -171,7 +171,6 @@ let
); );
parameterized = pkgsNew.haskell.lib.appendPatch haskellPackagesOld.parameterized ./nix/parameterized.patch; parameterized = pkgsNew.haskell.lib.appendPatch haskellPackagesOld.parameterized ./nix/parameterized.patch;
}; };
}; };
@ -180,6 +179,14 @@ let
pkgsNew.pythonPackages.protobuf pkgsNew.pythonPackages.protobuf
(oldAttrs : {doCheck = false; doInstallCheck = false;}); (oldAttrs : {doCheck = false; doInstallCheck = false;});
shell-hook-common =
pkgsNew.lib.optionalString pkgsNew.stdenv.isDarwin ''
export DYLD_LIBRARY_PATH=${pkgsNew.grpc}/lib''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH
'' +
pkgsNew.lib.optionalString pkgsNew.stdenv.isLinux ''
export LD_LIBRARY_PATH=${pkgsNew.grpc}/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH
'';
test-grpc-haskell = test-grpc-haskell =
pkgsNew.mkShell { pkgsNew.mkShell {
nativeBuildInputs = [ nativeBuildInputs = [
@ -201,13 +208,9 @@ let
export LD_LIBRARY_PATH=${pkgsNew.grpc}/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH export LD_LIBRARY_PATH=${pkgsNew.grpc}/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH
''; '';
shellHook = (oldAttributes.shellHook or "") + shellHook = (oldAttributes.shellHook or "") + ''
pkgsNew.lib.optionalString pkgsNew.stdenv.isDarwin '' ${shell-hook-common}
export DYLD_LIBRARY_PATH=${pkgsNew.grpc}/lib''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH '';
'' +
pkgsNew.lib.optionalString pkgsNew.stdenv.isLinux ''
export LD_LIBRARY_PATH=${pkgsNew.grpc}/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH
'';
} }
); );
}; };