From 7a0b9139fa56540f6013715ee85eb01d998978b4 Mon Sep 17 00:00:00 2001 From: Yurii Rashkovskii Date: Tue, 12 Jun 2018 18:00:30 -0700 Subject: [PATCH 1/2] 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 --- pkgs/shells/powershell/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index 93749491611..e1596472005 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 ''; From e5a990a3c2460037694d7673fedffa2555b8780d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 13 Jun 2018 23:08:46 +0100 Subject: [PATCH 2/2] powershell: autoPatchelfHook/makeWrapper belongs to nativeBuildInputs --- pkgs/shells/powershell/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index e1596472005..a053884bb88 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -22,7 +22,8 @@ stdenv.mkDerivation rec { stripRoot = false; }; - buildInputs = [ autoPatchelfHook makeWrapper less ] ++ libraries; + buildInputs = [ less ] ++ libraries; + nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; # 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