From 08c081309b4e024bc49463dba1e2d198b33c4f1d Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Sat, 2 Jan 2016 19:59:46 -0800 Subject: [PATCH] Revert "gnustep-make: fix installation path" This reverts commit 4f1559a75190c8e702d8c0d88c4c3791e47fcd4b. --- .../tools/build-managers/gnustep/make/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/gnustep/make/default.nix b/pkgs/development/tools/build-managers/gnustep/make/default.nix index 68af0c114c4..a58273e6086 100644 --- a/pkgs/development/tools/build-managers/gnustep/make/default.nix +++ b/pkgs/development/tools/build-managers/gnustep/make/default.nix @@ -11,7 +11,10 @@ stdenv.mkDerivation rec { patchPhase = '' substituteInPlace GNUmakefile.in \ - --replace which type + --replace which type \ + --replace 'tooldir = $(DESTDIR)' 'tooldir = ' \ + --replace 'makedir = $(DESTDIR)' 'makedir = ' \ + --replace 'mandir = $(DESTDIR)' 'mandir = ' substituteInPlace FilesystemLayouts/apple \ --replace /usr/local "" @@ -20,7 +23,7 @@ stdenv.mkDerivation rec { --replace /Library/GNUstep "$out" ''; - installFlags = [ "PREFIX=$(out)" ]; + installFlags = "DESTDIR=$(out)"; postInstall = '' mkdir -p $out/nix-support