From 998f087fea485a338ca4675c6880134a930a00e1 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Fri, 13 Oct 2017 15:28:32 +0100 Subject: [PATCH] dbench: fix wrong client.txt location (the path is hard-coded) cc @bjornfor --- pkgs/development/tools/misc/dbench/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/dbench/default.nix b/pkgs/development/tools/misc/dbench/default.nix index 997b1e18fd7..a1c9c11d34d 100644 --- a/pkgs/development/tools/misc/dbench/default.nix +++ b/pkgs/development/tools/misc/dbench/default.nix @@ -13,10 +13,18 @@ stdenv.mkDerivation rec { preConfigure = '' ./autogen.sh + configureFlagsArray+=("--datadir=$out/share/dbench") ''; postInstall = '' - cp -R loadfiles/ $out/share/ + cp -R loadfiles/* $out/share/dbench/doc/dbench/loadfiles + + # dbench looks here for the file + ln -s doc/dbench/loadfiles/client.txt $out/share/dbench/client.txt + + # backwards compatible to older nixpkgs packaging introduced by + # 3f27be8e5d5861cd4b9487d6c5212d88bf24316d + ln -s dbench/doc/dbench/loadfiles $out/share/loadfiles ''; meta = with stdenv.lib; {