From 2f7152f997feca9261a67fd9368dc3547d676c5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Thu, 11 May 2017 16:53:23 +0200 Subject: [PATCH] glusterfs: Remove no longer needed subsitutions of DESTDIR. They were made unnecessary in commit d07154b3bc8, which added `makeFlags = "DESTDIR=$(out)";`. --- pkgs/tools/filesystems/glusterfs/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 4689207e835..0eeff408d07 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -36,14 +36,6 @@ rec { makeFlags = "DESTDIR=$(out)"; - preInstall = '' - substituteInPlace api/examples/Makefile --replace '$(DESTDIR)' $out - substituteInPlace geo-replication/syncdaemon/Makefile --replace '$(DESTDIR)' $out - substituteInPlace geo-replication/syncdaemon/Makefile --replace '$(DESTDIR)' $out - substituteInPlace xlators/features/glupy/examples/Makefile --replace '$(DESTDIR)' $out - substituteInPlace xlators/features/glupy/src/Makefile --replace '$(DESTDIR)' $out - ''; - postInstall = '' cp -r $out/$out/* $out rm -r $out/nix