X-Git-Url: http://git.scottworley.com/auto-upgrade-with-pinch/blobdiff_plain/1d99b3479a1516a4bbfa7eee48d770843c1d2ebe..HEAD:/overlays/polite-merge.nix diff --git a/overlays/polite-merge.nix b/overlays/polite-merge.nix index e8eda59..37f7ba5 100644 --- a/overlays/polite-merge.nix +++ b/overlays/polite-merge.nix @@ -1,4 +1,10 @@ -self: super: { +self: super: +let + checkInputsAreNative = self.lib.hasInfix "nativeCheckInputs" + (builtins.readFile ); + checkInputsName = + if checkInputsAreNative then "nativeCheckInputs" else "checkInputs"; +in { polite-merge = if builtins.hasAttr "polite-merge" super then super.polite-merge else @@ -7,12 +13,12 @@ self: super: { pname = "polite-merge"; version = "2.4"; src = fetchgit { - url = "https://scottworley.com/polite-merge.git"; + url = "https://git.scottworley.com/pub/git/polite-merge"; rev = version; sha256 = "1p6ivaay3bk4vvqqic7g23xrhkkq8z19zhsaxkav8kk90s2bmmza"; }; postUnpack = "patchShebangs ."; - checkInputs = [ git ]; + "${checkInputsName}" = [ git ]; doCheck = true; preInstall = "export prefix"; }) { };