diff options
author | Yurii Rashkovskii <yrashk@gmail.com> | 2018-06-12 18:00:30 -0700 |
---|---|---|
committer | Yurii Rashkovskii <yrashk@gmail.com> | 2018-06-13 06:14:52 -0700 |
commit | 7a0b9139fa56540f6013715ee85eb01d998978b4 (patch) | |
tree | ed5d2a0869cc1651d1203aae1fd3c63c4e6d17b5 | |
parent | 40eb14c972a216aae546ba713bf3b1a85dd20a99 (diff) | |
download | nixlib-7a0b9139fa56540f6013715ee85eb01d998978b4.tar nixlib-7a0b9139fa56540f6013715ee85eb01d998978b4.tar.gz nixlib-7a0b9139fa56540f6013715ee85eb01d998978b4.tar.bz2 nixlib-7a0b9139fa56540f6013715ee85eb01d998978b4.tar.lz nixlib-7a0b9139fa56540f6013715ee85eb01d998978b4.tar.xz nixlib-7a0b9139fa56540f6013715ee85eb01d998978b4.tar.zst nixlib-7a0b9139fa56540f6013715ee85eb01d998978b4.zip |
powershell: fix the build
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
-rw-r--r-- | pkgs/shells/powershell/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index 937494916112..e15964720056 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -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 ''; |