From e1c059c8502bbda2f2fbb60da49dc1f4c473597f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 12 Apr 2020 09:57:11 +1000 Subject: [PATCH 1/2] shellcheck: don't build locally --- pkgs/development/tools/shellcheck/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/tools/shellcheck/default.nix b/pkgs/development/tools/shellcheck/default.nix index 17d815431d7..125a2baa455 100644 --- a/pkgs/development/tools/shellcheck/default.nix +++ b/pkgs/development/tools/shellcheck/default.nix @@ -40,10 +40,6 @@ let install -Dm644 shellcheck.1 $man/share/man/man1/shellcheck.1 mkdir $out ''; - - # just some file copying - preferLocalBuild = true; - allowSubstitutes = false; }; in From e32be84ad4dcd8fa63b5c21891494f074f6774e7 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 12 Apr 2020 10:46:57 +1000 Subject: [PATCH 2/2] shellcheck: inherit meta --- pkgs/development/tools/shellcheck/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/tools/shellcheck/default.nix b/pkgs/development/tools/shellcheck/default.nix index 125a2baa455..568b9e1e1dd 100644 --- a/pkgs/development/tools/shellcheck/default.nix +++ b/pkgs/development/tools/shellcheck/default.nix @@ -16,13 +16,12 @@ let in drv' // { meta = meta' // overrideFn meta'; }; bin = haskell.lib.justStaticExecutables haskellPackages.ShellCheck; - src = haskellPackages.ShellCheck.src; shellcheck = stdenv.mkDerivation { pname = "shellcheck"; version = bin.version; - inherit src; + inherit (haskellPackages.ShellCheck) meta src; nativeBuildInputs = [ pandoc ];