diff options
author | Nikolay Amiantov <ab@fmap.me> | 2016-01-03 03:24:49 +0300 |
---|---|---|
committer | Nikolay Amiantov <ab@fmap.me> | 2016-01-03 03:24:49 +0300 |
commit | deda44195a9ad97187c1401c1b3a2ddcf271d4f8 (patch) | |
tree | f8fdcc2ffdf999fb3107e234251f242658607165 | |
parent | 4a0ec15cd0070068f361cc8f35ef2700799a39d5 (diff) | |
parent | 10a87beb7ea8a3b64c689a44f060d15f5ce2ebc5 (diff) | |
download | nixlib-deda44195a9ad97187c1401c1b3a2ddcf271d4f8.tar nixlib-deda44195a9ad97187c1401c1b3a2ddcf271d4f8.tar.gz nixlib-deda44195a9ad97187c1401c1b3a2ddcf271d4f8.tar.bz2 nixlib-deda44195a9ad97187c1401c1b3a2ddcf271d4f8.tar.lz nixlib-deda44195a9ad97187c1401c1b3a2ddcf271d4f8.tar.xz nixlib-deda44195a9ad97187c1401c1b3a2ddcf271d4f8.tar.zst nixlib-deda44195a9ad97187c1401c1b3a2ddcf271d4f8.zip |
Merge branch 'fix-murmur_git-build' of https://github.com/exi/nixpkgs
Closes #12052
-rw-r--r-- | pkgs/applications/networking/mumble/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index dac1a9ada3b4..a0eb459369df 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -95,7 +95,7 @@ let type = "murmur"; postPatch = optional iceSupport '' - sed -i 's,/usr/share/Ice/,${zeroc_ice}/,g' src/murmur/murmur.pro + grep -Rl '/usr/share/Ice' . | xargs sed -i 's,/usr/share/Ice/,${zeroc_ice}/,g' ''; configureFlags = [ |