From 8c0074dd9f02daffe7b11b5ce427fd899e189b09 Mon Sep 17 00:00:00 2001 From: Benno Fünfstück Date: Mon, 20 Mar 2017 22:25:10 +0100 Subject: drbd: fix output file location (#23541) drbd was installing files into $out/nix/store/... due to the usage of DESTDIR (setting both DESTDIR + prefix to $out will cause files to be installed into $out/$out/...) --- pkgs/os-specific/linux/drbd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/os-specific/linux') diff --git a/pkgs/os-specific/linux/drbd/default.nix b/pkgs/os-specific/linux/drbd/default.nix index 60615fb1e5b..ead0d41ab8d 100644 --- a/pkgs/os-specific/linux/drbd/default.nix +++ b/pkgs/os-specific/linux/drbd/default.nix @@ -19,17 +19,17 @@ stdenv.mkDerivation rec { preConfigure = '' export PATH=${systemd.udev.bin}/sbin:$PATH - substituteInPlace user/Makefile.in --replace /sbin/ $out/sbin/ + substituteInPlace user/Makefile.in \ + --replace /sbin '$(sbindir)' substituteInPlace user/legacy/Makefile.in \ - --replace /sbin/ $out/sbin/ \ - --replace '$(DESTDIR)/lib/drbd' $out/lib/drbd + --replace '$(DESTDIR)/lib/drbd' '$(DESTDIR)$(LIBDIR)' substituteInPlace user/drbdadm_usage_cnt.c --replace /lib/drbd $out/lib/drbd substituteInPlace scripts/drbd.rules --replace /sbin/drbdadm $out/sbin/drbdadm ''; makeFlags = "SHELL=${stdenv.shell}"; - installFlags = "localstatedir=$(TMPDIR)/var sysconfdir=$(out)/etc INITDIR=$(out)/etc/init.d DESTDIR=$(out)"; + installFlags = "localstatedir=$(TMPDIR)/var sysconfdir=$(out)/etc INITDIR=$(out)/etc/init.d"; meta = { homepage = http://www.drbd.org/; -- cgit 1.4.1