treewide: fixup bcf54ce

fix the executable bit for scripts installed with substituteAll
and some remaining shebangs.

9 files changed, 16 insertions, 7 deletions

diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix
index 153c6d78a7b..38c3da220c9 100644
--- a/pkgs/applications/version-management/smartgithg/default.nix
+++ b/pkgs/applications/version-management/smartgithg/default.nix
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
     bin_path = "$out/bin";
     install_freedesktop_items = substituteAll {
       inherit (stdenv) shell;
+      isExecutable = true;
       src = ./install_freedesktop_items.sh;
     };
     runtime_paths = lib.makeBinPath [
diff --git a/pkgs/build-support/docker/store-path-to-layer.sh b/pkgs/build-support/docker/store-path-to-layer.sh
index ab956c81904..98c5b8cc212 100755
--- a/pkgs/build-support/docker/store-path-to-layer.sh
+++ b/pkgs/build-support/docker/store-path-to-layer.sh
@@ -1,4 +1,4 @@
-#! @shell@
+#!@shell@
 
 set -eu
 
diff --git a/pkgs/development/compilers/ghc/8.2.2-binary.nix b/pkgs/development/compilers/ghc/8.2.2-binary.nix
index af98e9a311d..9fe3a7d9dba 100644
--- a/pkgs/development/compilers/ghc/8.2.2-binary.nix
+++ b/pkgs/development/compilers/ghc/8.2.2-binary.nix
@@ -123,6 +123,7 @@ stdenv.mkDerivation rec {
   let
     gcc-clang-wrapper = substituteAll {
       inherit (stdenv) shell;
+      isExecutable = true;
       src = ./gcc-clang-wrapper.sh;
     };
   in
diff --git a/pkgs/games/gargoyle/default.nix b/pkgs/games/gargoyle/default.nix
index c908a9b75a9..e645a40aa75 100644
--- a/pkgs/games/gargoyle/default.nix
+++ b/pkgs/games/gargoyle/default.nix
@@ -40,7 +40,11 @@ stdenv.mkDerivation {
 
   installPhase =
   if stdenv.isDarwin then
-    (substituteAll { inherit (stdenv) shell; src = ./darwin.sh; })
+  (substituteAll {
+    inherit (stdenv) shell;
+    isExecutable = true;
+    src = ./darwin.sh;
+  })
   else jamenv + ''
     jam -j$NIX_BUILD_CORES install
     mkdir -p "$out/bin"
diff --git a/pkgs/os-specific/linux/rfkill/udev.nix b/pkgs/os-specific/linux/rfkill/udev.nix
index 6ba4f8d4b06..f9d6dc99db8 100644
--- a/pkgs/os-specific/linux/rfkill/udev.nix
+++ b/pkgs/os-specific/linux/rfkill/udev.nix
@@ -27,9 +27,10 @@
 let
   rfkillHook =
     substituteAll {
-    inherit (stdenv) shell;
-    src = ./rfkill-hook.sh;
-  };
+      inherit (stdenv) shell;
+      isExecutable = true;
+      src = ./rfkill-hook.sh;
+    };
 in stdenv.mkDerivation {
   name = "rfkill-udev";
 
@@ -44,7 +45,6 @@ in stdenv.mkDerivation {
 
     mkdir -p "$out/bin/";
     cp ${rfkillHook} "$out/bin/rfkill-hook.sh"
-    chmod +x "$out/bin/rfkill-hook.sh";
   '';
 
   meta = {
diff --git a/pkgs/os-specific/linux/service-wrapper/default.nix b/pkgs/os-specific/linux/service-wrapper/default.nix
index 6c9635b3aee..8adb2e5413c 100644
--- a/pkgs/os-specific/linux/service-wrapper/default.nix
+++ b/pkgs/os-specific/linux/service-wrapper/default.nix
@@ -7,6 +7,7 @@ in
 runCommand "${name}" {
   script = substituteAll {
     src = ./service-wrapper.sh;
+    isExecutable = true;
     inherit (stdenv) shell;
     inherit coreutils;
   };
diff --git a/pkgs/tools/archivers/rpmextract/default.nix b/pkgs/tools/archivers/rpmextract/default.nix
index 6d5041c52d0..3c515b8c195 100644
--- a/pkgs/tools/archivers/rpmextract/default.nix
+++ b/pkgs/tools/archivers/rpmextract/default.nix
@@ -9,6 +9,7 @@ stdenv.mkDerivation rec {
     
   script = substituteAll {
     src = ./rpmextract.sh;
+    isExecutable = true;
     inherit rpm cpio;
     inherit (stdenv) shell;
   };
diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix
index 301e7cb1f92..155c63c87e1 100644
--- a/pkgs/tools/security/eid-mw/default.nix
+++ b/pkgs/tools/security/eid-mw/default.nix
@@ -37,6 +37,7 @@ stdenv.mkDerivation rec {
   let
     eid-nssdb-in = substituteAll {
       inherit (stdenv) shell;
+      isExecutable = true;
       src = ./eid-nssdb.in;
     };
   in
diff --git a/pkgs/tools/security/eid-mw/eid-nssdb.in b/pkgs/tools/security/eid-mw/eid-nssdb.in
index fc05a20a675..636b4c1ee11 100644
--- a/pkgs/tools/security/eid-mw/eid-nssdb.in
+++ b/pkgs/tools/security/eid-mw/eid-nssdb.in
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@shell@
 
 rootdb="/etc/pki/nssdb"
 userdb="$HOME/.pki/nssdb"