From 83edcc15ea9d453cad3c0915ad8aefc2ef24850a Mon Sep 17 00:00:00 2001 From: ldesgoui Date: Fri, 2 Oct 2020 00:10:30 +0200 Subject: [PATCH] mumble-overlay: fix outdated install phase As it stands, the mumble-overlay install phase attemps to link `{mumble}/lib/libmumble.so.1.2.*` to its output's `lib/libmumble.so.1`, this has stopped matching any file ever since mumble has passed version 1.3. Instead, we simply link from `{mumble}/lib/libmumble.so.1` --- pkgs/applications/networking/mumble/overlay.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mumble/overlay.nix b/pkgs/applications/networking/mumble/overlay.nix index babb3812bb92..d3af518a3c54 100644 --- a/pkgs/applications/networking/mumble/overlay.nix +++ b/pkgs/applications/networking/mumble/overlay.nix @@ -12,11 +12,13 @@ in stdenv.mkDerivation { installPhase = '' mkdir -p $out/lib - ln -s ${mumble}/lib/libmumble.so.1.2.* $out/lib/libmumble.so.1 + ln -s ${mumble}/lib/libmumble.so.1 $out/lib/ + ${lib.optionalString (mumble_i686 != null) '' mkdir -p $out/lib32 - ln -s ${mumble_i686}/lib/libmumble.so.1.2.* $out/lib32/libmumble.so.1 + ln -s ${mumble_i686}/lib/libmumble.so.1 $out/lib32/ ''} + install -Dm755 scripts/mumble-overlay $out/bin/mumble-overlay sed -i "s,/usr/lib,$out/lib,g" $out/bin/mumble-overlay sed -i '2iPATH="${binPath}:$PATH"' $out/bin/mumble-overlay