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

mumble_overlay: move from mumble and more fixes

Browse Source
This commit is contained in:
Nikolay Amiantov 2016-04-24 18:49:22 +03:00
parent d1d4bd9a9d
commit 73182fd328
3 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/mumble/default.nix
View File

@ -83,10 +83,6 @@ let
NIX_CFLAGS_COMPILE = optional speechdSupport "-I${speechd}/include/speech-dispatcher"; NIX_CFLAGS_COMPILE = optional speechdSupport "-I${speechd}/include/speech-dispatcher";
installPhase = '' installPhase = ''
install -m755 scripts/mumble-overlay $out/bin
sed -i "s,/usr/lib,$out/lib,g" $out/bin/mumble-overlay
( cd $out/lib; ln -s libmumble.so.1.* libmumble.so.1 )
mkdir -p $out/share/applications mkdir -p $out/share/applications
cp scripts/mumble.desktop $out/share/applications cp scripts/mumble.desktop $out/share/applications

24
pkgs/applications/networking/mumble/overlay.nix Normal file
View File

@ -0,0 +1,24 @@
{ stdenv, lib, which, file, mumble, mumble_i686
}:
let
binPath = lib.makeBinPath [ which file ];
in stdenv.mkDerivation {
name = "mumble-overlay-${mumble.version}";
inherit (mumble) src;
phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
installPhase = ''
mkdir -p $out/lib
ln -s ${mumble}/lib/libmumble.so.1.* $out/lib/libmumble.so.1
${lib.optionalString (mumble_i686 != null) ''
mkdir -p $out/lib32
ln -s ${mumble_i686}/lib/libmumble.so.1.* $out/lib32/libmumble.so.1
''}
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
'';
}

6
pkgs/top-level/all-packages.nix
View File

@ -13280,6 +13280,12 @@ in
iceSupport = config.murmur.iceSupport or true; iceSupport = config.murmur.iceSupport or true;
}) mumble mumble_git murmur murmur_git; }) mumble mumble_git murmur murmur_git;
mumble_overlay = callPackage ../applications/networking/mumble/overlay.nix {
mumble_i686 = if system == "x86_64-linux"
then pkgsi686Linux.mumble
else null;
};
musescore = qt5.callPackage ../applications/audio/musescore { }; musescore = qt5.callPackage ../applications/audio/musescore { };
mutt = callPackage ../applications/networking/mailreaders/mutt { }; mutt = callPackage ../applications/networking/mailreaders/mutt { };