Merge pull request #56923 from rnhmjoj/xfix

treewide: fixup bcf54ce

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 [

pkgs/build-support/docker/store-path-to-layer.sh

@@ -1,4 +1,4 @@
-#! @shell@
+#!@shell@
 
 set -eu
 

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

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"

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 = {

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;
   };

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;
   };

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

pkgs/tools/security/eid-mw/eid-nssdb.in

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@shell@
 
 rootdb="/etc/pki/nssdb"
 userdb="$HOME/.pki/nssdb"