alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

powershell: fix the build

Browse source 
For some reason, building powershell derivation started failing with
these errors:

```
  liblttng-ust.so.0 -> not found!
  ...
  libpam.so.0 -> not found!
```

This patch adds these dependencies
This commit is contained in:
Yurii Rashkovskii 2018-06-12 18:00:30 -07:00
parent 40eb14c972
commit 7a0b9139fa
No known key found for this signature in database
GPG key ID: 1D60D7CFD80845FF
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/shells/powershell/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchgit, autoPatchelfHook, fetchzip, libunwind, libuuid, icu, curl, cacert,
makeWrapper, less, openssl }:
{ stdenv, fetchgit, autoPatchelfHook, fetchzip, libunwind, libuuid, icu, curl,
makeWrapper, less, openssl, pam, lttng-ust }:
let platformString = if stdenv.isDarwin then "osx"
else if stdenv.isLinux then "linux"
@ -10,6 +10,7 @@ let platformString = if stdenv.isDarwin then "osx"
platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH"
else if stdenv.isLinux then "LD_LIBRARY_PATH"
else throw "unsupported platform";
libraries = [ libunwind libuuid icu curl openssl lttng-ust ] ++ (if stdenv.isLinux then [ pam ] else []);
in
stdenv.mkDerivation rec {
name = "powershell-${version}";
@ -21,8 +22,7 @@ stdenv.mkDerivation rec {
stripRoot = false;
};
buildInputs = [ autoPatchelfHook makeWrapper ];
propagatedBuildInputs = [ libunwind libuuid icu curl cacert less openssl ];
buildInputs = [ autoPatchelfHook makeWrapper less ] ++ libraries;
# TODO: remove PAGER after upgrading to v6.1.0-preview.1 or later as it has been addressed in
# https://github.com/PowerShell/PowerShell/pull/6144
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/share/powershell
cp -r * $out/share/powershell
rm $out/share/powershell/DELETE_ME_TO_DISABLE_CONSOLEHOST_TELEMETRY
makeWrapper $out/share/powershell/pwsh $out/bin/pwsh --prefix ${platformLdLibraryPath} : "${stdenv.lib.makeLibraryPath [ libunwind libuuid icu openssl curl ]}" \
makeWrapper $out/share/powershell/pwsh $out/bin/pwsh --prefix ${platformLdLibraryPath} : "${stdenv.lib.makeLibraryPath libraries}" \
--set PAGER ${less}/bin/less --set TERM xterm
'';