diff options
| author | Benno Fünfstück <benno.fuenfstueck@gmail.com> | 2017-03-20 22:25:10 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-03-20 22:25:10 +0100 |
| commit | 8c0074dd9f02daffe7b11b5ce427fd899e189b09 (patch) | |
| tree | eddf13afe024060ea6300f5ebb999978c2b5f6bf /pkgs/os-specific/linux/drbd/default.nix | |
| parent | 7a130be3e4cba4a8926b19b55892f8bb27287487 (diff) | |
| download | nixpkgs-8c0074dd9f02daffe7b11b5ce427fd899e189b09.tar nixpkgs-8c0074dd9f02daffe7b11b5ce427fd899e189b09.tar.gz nixpkgs-8c0074dd9f02daffe7b11b5ce427fd899e189b09.tar.bz2 nixpkgs-8c0074dd9f02daffe7b11b5ce427fd899e189b09.tar.lz nixpkgs-8c0074dd9f02daffe7b11b5ce427fd899e189b09.tar.xz nixpkgs-8c0074dd9f02daffe7b11b5ce427fd899e189b09.tar.zst nixpkgs-8c0074dd9f02daffe7b11b5ce427fd899e189b09.zip | |
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/...)
Diffstat (limited to 'pkgs/os-specific/linux/drbd/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/drbd/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
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/; |