dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #56923 from rnhmjoj/xfix

Browse Source 
treewide: fixup bcf54ce
This commit is contained in:
Peter Simons 2019-04-12 11:07:35 +02:00 committed by GitHub
commit 88e7c77bb2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/applications/version-management/smartgithg/default.nix
View File

@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
bin_path = "$out/bin"; bin_path = "$out/bin";
install_freedesktop_items = substituteAll { install_freedesktop_items = substituteAll {
inherit (stdenv) shell; inherit (stdenv) shell;
isExecutable = true;
src = ./install_freedesktop_items.sh; src = ./install_freedesktop_items.sh;
}; };
runtime_paths = lib.makeBinPath [ runtime_paths = lib.makeBinPath [

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

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

1
pkgs/development/compilers/ghc/8.2.2-binary.nix
View File

@ -123,6 +123,7 @@ stdenv.mkDerivation rec {
let let
gcc-clang-wrapper = substituteAll { gcc-clang-wrapper = substituteAll {
inherit (stdenv) shell; inherit (stdenv) shell;
isExecutable = true;
src = ./gcc-clang-wrapper.sh; src = ./gcc-clang-wrapper.sh;
}; };
in in

6
pkgs/games/gargoyle/default.nix
View File

@ -40,7 +40,11 @@ stdenv.mkDerivation {
installPhase = installPhase =
if stdenv.isDarwin then if stdenv.isDarwin then
(substituteAll { inherit (stdenv) shell; src = ./darwin.sh; }) (substituteAll {
inherit (stdenv) shell;
isExecutable = true;
src = ./darwin.sh;
})
else jamenv + '' else jamenv + ''
jam -j$NIX_BUILD_CORES install jam -j$NIX_BUILD_CORES install
mkdir -p "$out/bin" mkdir -p "$out/bin"

8
pkgs/os-specific/linux/rfkill/udev.nix
View File

@ -27,9 +27,10 @@
let let
rfkillHook = rfkillHook =
substituteAll { substituteAll {
inherit (stdenv) shell; inherit (stdenv) shell;
src = ./rfkill-hook.sh; isExecutable = true;
}; src = ./rfkill-hook.sh;
};
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "rfkill-udev"; name = "rfkill-udev";
@ -44,7 +45,6 @@ in stdenv.mkDerivation {
mkdir -p "$out/bin/"; mkdir -p "$out/bin/";
cp ${rfkillHook} "$out/bin/rfkill-hook.sh" cp ${rfkillHook} "$out/bin/rfkill-hook.sh"
chmod +x "$out/bin/rfkill-hook.sh";
''; '';
meta = { meta = {

1
pkgs/os-specific/linux/service-wrapper/default.nix
View File

@ -7,6 +7,7 @@ in
runCommand "${name}" { runCommand "${name}" {
script = substituteAll { script = substituteAll {
src = ./service-wrapper.sh; src = ./service-wrapper.sh;
isExecutable = true;
inherit (stdenv) shell; inherit (stdenv) shell;
inherit coreutils; inherit coreutils;
}; };

1
pkgs/tools/archivers/rpmextract/default.nix
View File

@ -9,6 +9,7 @@ stdenv.mkDerivation rec {
script = substituteAll { script = substituteAll {
src = ./rpmextract.sh; src = ./rpmextract.sh;
isExecutable = true;
inherit rpm cpio; inherit rpm cpio;
inherit (stdenv) shell; inherit (stdenv) shell;
}; };

1
pkgs/tools/security/eid-mw/default.nix
View File

@ -37,6 +37,7 @@ stdenv.mkDerivation rec {
let let
eid-nssdb-in = substituteAll { eid-nssdb-in = substituteAll {
inherit (stdenv) shell; inherit (stdenv) shell;
isExecutable = true;
src = ./eid-nssdb.in; src = ./eid-nssdb.in;
}; };
in in

2
pkgs/tools/security/eid-mw/eid-nssdb.in
View File

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