Commit 99e93489 authored by nicoo's avatar nicoo
Browse files

bees: substituteAll → makeWrapper 

This is tidier, and removes manually-maintained nix-isms from the script.
parent 01e04f8d

pkgs/tools/filesystems/bees/bees-service-wrapper

+0 −4
Original line number Diff line number Diff line 
#!@bash@/bin/bash

PATH=@bash@/bin:@coreutils@/bin:@utillinux@/bin:@btrfsProgs@/bin:$PATH

beesd_bin=@bees@/lib/bees/bees

# PLEASE KEEP NIX-ISMS ABOVE THIS LINE TO EASE UPSTREAM MERGE

#!/usr/bin/env bash



shopt -s extglob

pkgs/tools/filesystems/bees/default.nix

+13 −10
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, bash

, makeWrapper

, nixosTests



, stdenv

# Build inputs

, btrfs-progs

, coreutils

, python3Packages

, util-linux

, nixosTests

, python3Packages

# bees-service-wrapper

, bash

, coreutils

}:



stdenv.mkDerivation rec {
@@ -26,6 +30,7 @@ stdenv.mkDerivation rec { 
  ];



  nativeBuildInputs = [

    makeWrapper

    python3Packages.markdown # documentation build

  ];
@@ -38,12 +43,10 @@ stdenv.mkDerivation rec { 
    unset -f git

  '';



  inherit bash bees coreutils;

  utillinux = util-linux;

  btrfsProgs = btrfs-progs;

  postInstall = ''

    substituteAll ${./bees-service-wrapper} "$out"/bin/bees-service-wrapper

    chmod +x "$out"/bin/bees-service-wrapper

    makeWrapper ${./bees-service-wrapper} "$out"/bin/bees-service-wrapper \

      --prefix PATH : ${lib.makeBinPath [ bash coreutils util-linux btrfs-progs ]} \

      --set beesd_bin "$out"/lib/bees/bees

  '';



  buildFlags = [