diff options
author | rnhmjoj <rnhmjoj@inventati.org> | 2019-03-06 00:10:34 +0100 |
---|---|---|
committer | rnhmjoj <rnhmjoj@inventati.org> | 2019-04-12 09:09:22 +0200 |
commit | 5ea4160b33ed089ee6243bc2c1d67d0fe8653039 (patch) | |
tree | c3249c4f5c93f4316a0af10ed8ab1ed38dd81956 | |
parent | d0506bed9f8218f7d09e0c3f439424ff64086011 (diff) |
treewide: fixup bcf54ce
fix the executable bit for scripts installed with substituteAll
and some remaining shebangs.
-rw-r--r-- | pkgs/applications/version-management/smartgithg/default.nix | 1 | ||||
-rwxr-xr-x | pkgs/build-support/docker/store-path-to-layer.sh | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/8.2.2-binary.nix | 1 | ||||
-rw-r--r-- | pkgs/games/gargoyle/default.nix | 6 | ||||
-rw-r--r-- | pkgs/os-specific/linux/rfkill/udev.nix | 8 | ||||
-rw-r--r-- | pkgs/os-specific/linux/service-wrapper/default.nix | 1 | ||||
-rw-r--r-- | pkgs/tools/archivers/rpmextract/default.nix | 1 | ||||
-rw-r--r-- | pkgs/tools/security/eid-mw/default.nix | 1 | ||||
-rw-r--r-- | pkgs/tools/security/eid-mw/eid-nssdb.in | 2 |
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 153c6d78a7b7..38c3da220c92 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 ab956c819040..98c5b8cc2129 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 af98e9a311d5..9fe3a7d9dba3 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 c908a9b75a9c..e645a40aa752 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 6ba4f8d4b064..f9d6dc99db83 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 6c9635b3aee4..8adb2e5413c4 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 6d5041c52d03..3c515b8c195d 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 301e7cb1f92e..155c63c87e13 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 fc05a20a6758..636b4c1ee118 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" |