From 9221389b9029a61eebedde615ab5c8b52aec7914 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Mon, 18 May 2020 11:47:10 -0700 Subject: [PATCH 1/1] Only add pinch if not already present --- overlays/pinch.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/overlays/pinch.nix b/overlays/pinch.nix index 1b2c65f..3399609 100644 --- a/overlays/pinch.nix +++ b/overlays/pinch.nix @@ -1,9 +1,14 @@ self: super: { - pinch = super.writeShellScriptBin "pinch" '' - exec ${self.python3}/bin/python3 ${super.fetchgit { - url = "https://scottworley.com/pinch.git"; - rev = "1.1"; - sha256 = "0ilbhvr0d83kfwkm7ak64gik44gi2axfnp9rzsa7g5cwz9qaxdbv"; - }}/pinch.py "$@" - ''; + pinch = if builtins.hasAttr "pinch" super then + super.pinch + else + super.writeShellScriptBin "pinch" '' + exec ${self.python3}/bin/python3 ${ + super.fetchgit { + url = "https://scottworley.com/pinch.git"; + rev = "1.1"; + sha256 = "0ilbhvr0d83kfwkm7ak64gik44gi2axfnp9rzsa7g5cwz9qaxdbv"; + } + }/pinch.py "$@" + ''; } -- 2.44.1