summary refs log tree commit diff
diff options
context:
space:
mode:
authorNikolay Amiantov <ab@fmap.me>2016-01-03 03:24:49 +0300
committerNikolay Amiantov <ab@fmap.me>2016-01-03 03:24:49 +0300
commitdeda44195a9ad97187c1401c1b3a2ddcf271d4f8 (patch)
treef8fdcc2ffdf999fb3107e234251f242658607165
parent4a0ec15cd0070068f361cc8f35ef2700799a39d5 (diff)
parent10a87beb7ea8a3b64c689a44f060d15f5ce2ebc5 (diff)
downloadnixlib-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.nix2
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 = [