From 59027e28800dd5c2cd1c9d434c1a71d39be19266 Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Wed, 15 Aug 2018 12:07:03 -0700 Subject: [PATCH] Revert "libvirt: fix dlopen("libjansson.so.4")" This reverts commit d46cfd2ff087816697f46d69f9f795ff878301c5, which broke libvirt + some dependent packages (notably nixops) on Darwin --- pkgs/development/libraries/libvirt/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 14db7d6a1c4..63f11daad28 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -59,10 +59,6 @@ in stdenv.mkDerivation rec { substituteInPlace src/lxc/lxc_conf.c \ --replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",' - [ -f ${jansson}/lib/libjansson.so.4 ] || exit 1 - substituteInPlace src/util/virjsoncompat.c \ - --replace '"libjansson.so.4"' '"${jansson}/lib/libjansson.so.4"' - patchShebangs . # fixes /usr/bin/python references '';