public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #126176 from NixOS/backport-126137-to-release-21.05

Browse Source 
[Backport release-21.05] nix-direnv: make flakes support optional and off by default
This commit is contained in:
Jörg Thalheim 2021-06-08 10:20:51 +02:00 committed by GitHub
commit 633ab195e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/tools/misc/nix-direnv/default.nix
View File

@ -1,5 +1,15 @@
{ lib, stdenv, fetchFromGitHub, gnugrep, nixUnstable }: { lib
, stdenv
, fetchFromGitHub
, gnugrep
, nixStable
, nixUnstable
, enableFlakes ? false
}:
let
nix = if enableFlakes then nixUnstable else nixStable;
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "nix-direnv"; pname = "nix-direnv";
version = "1.2.6"; version = "1.2.6";
@ -14,7 +24,7 @@ stdenv.mkDerivation rec {
# Substitute instead of wrapping because the resulting file is # Substitute instead of wrapping because the resulting file is
# getting sourced, not executed: # getting sourced, not executed:
postPatch = '' postPatch = ''
sed -i "1a NIX_BIN_PREFIX=${nixUnstable}/bin/" direnvrc sed -i "1a NIX_BIN_PREFIX=${nix}/bin/" direnvrc
substituteInPlace direnvrc --replace "grep" "${gnugrep}/bin/grep" substituteInPlace direnvrc --replace "grep" "${gnugrep}/bin/grep"
''; '';