public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #41907 from yrashk/powershell-fix

Browse Source 
powershell: fix the build
This commit is contained in:
Jörg Thalheim 2018-06-13 23:11:16 +01:00 committed by GitHub
commit 9d9f6bca6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/shells/powershell/default.nix
View File

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