From 9cb9e6509ee66f6089b73fa765728182aeaa2d77 Mon Sep 17 00:00:00 2001 From: Chuck Date: Thu, 3 Oct 2019 15:18:06 -0700 Subject: [PATCH] nerdfonts: Use patchShebangs In commit e8e191a1be9d after v2.0.0, nerdfonts switched from #!/bin/bash to #!/usr/bin/env bash. Rather than synchronizing this patching with that change, just use patchShebangs which handles both cases. --- pkgs/data/fonts/nerdfonts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/nerdfonts/default.nix b/pkgs/data/fonts/nerdfonts/default.nix index 59b0f89e45ed..454cbc092810 100644 --- a/pkgs/data/fonts/nerdfonts/default.nix +++ b/pkgs/data/fonts/nerdfonts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, bash, which, withFont ? "" }: +{ stdenv, fetchFromGitHub, which, withFont ? "" }: stdenv.mkDerivation rec { version = "2.0.0"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { dontPatchShebangs = true; buildInputs = [ which ]; patchPhase = '' - sed -i -e 's|/bin/bash|${bash}/bin/bash|g' install.sh + patchShebangs install.sh sed -i -e 's|font_dir="\$HOME/.local/share/fonts|font_dir="$out/share/fonts/truetype|g' install.sh ''; installPhase = ''