From 588e05ddff66fa29c57e5e71b09d91a48e3b6468 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 28 Apr 2021 11:47:37 +0200 Subject: [PATCH] Fix tarball build replaceDependency is based on IFD so it cannot be used in packages. Thankfully what we are doing with libhandy can be easily achieved with sed. --- pkgs/development/libraries/libhandy/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 1e0a4990b01..56853b0c3b8 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -22,7 +22,7 @@ , at-spi2-core , gnome3 , libhandy -, replaceDependency +, runCommand }: stdenv.mkDerivation rec { @@ -102,11 +102,11 @@ stdenv.mkDerivation rec { libhandyWithGlade = libhandy.override { enableGlade = true; }; - in (replaceDependency { - drv = libhandyWithGlade.glade; - oldDependency = libhandyWithGlade.out; - newDependency = libhandy.out; - }); + in runCommand "${libhandy.name}-glade" {} '' + cp -r "${libhandyWithGlade.glade}" "$out" + chmod -R +w "$out" + sed -e "s#${libhandyWithGlade.out}#${libhandy.out}#g" -e "s#${libhandyWithGlade.glade}#$out#g" -i $(find "$out" -type f) + ''; }; meta = with lib; {