diff options
| author | zimbatm <zimbatm@zimbatm.com> | 2016-06-12 18:11:37 +0100 |
|---|---|---|
| committer | zimbatm <zimbatm@zimbatm.com> | 2016-06-12 18:11:37 +0100 |
| commit | 28fa4a2f03e2232d95dec9dc2b8ef40857d725db (patch) | |
| tree | 60a16516608d1b34c78b1a19bfdac0c9188f8412 /pkgs/development/ruby-modules/gem/default.nix | |
| parent | 852e9c309638c3e1c0e611c70a2b443d52455aca (diff) | |
| download | nixpkgs-28fa4a2f03e2232d95dec9dc2b8ef40857d725db.tar nixpkgs-28fa4a2f03e2232d95dec9dc2b8ef40857d725db.tar.gz nixpkgs-28fa4a2f03e2232d95dec9dc2b8ef40857d725db.tar.bz2 nixpkgs-28fa4a2f03e2232d95dec9dc2b8ef40857d725db.tar.lz nixpkgs-28fa4a2f03e2232d95dec9dc2b8ef40857d725db.tar.xz nixpkgs-28fa4a2f03e2232d95dec9dc2b8ef40857d725db.tar.zst nixpkgs-28fa4a2f03e2232d95dec9dc2b8ef40857d725db.zip | |
Escape all shell arguments uniformly
Diffstat (limited to 'pkgs/development/ruby-modules/gem/default.nix')
| -rw-r--r-- | pkgs/development/ruby-modules/gem/default.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix index 6e1b0c00bd0..74dc64000c0 100644 --- a/pkgs/development/ruby-modules/gem/default.nix +++ b/pkgs/development/ruby-modules/gem/default.nix @@ -18,8 +18,8 @@ # Normal gem packages can be used outside of bundler; a binstub is created in # $out/bin. -{ lib, ruby, bundler, fetchurl, fetchgit, makeWrapper, git, - buildRubyGem, darwin +{ lib, fetchurl, fetchgit, makeWrapper, git, darwin +, ruby, bundler } @ defs: lib.makeOverridable ( @@ -53,7 +53,6 @@ lib.makeOverridable ( , ...} @ attrs: let - shellEscape = x: "'${lib.replaceChars ["'"] [("'\\'" + "'")] x}'"; src = attrs.src or ( if type == "gem" then fetchurl { @@ -165,7 +164,7 @@ stdenv.mkDerivation (attrs // { ${src} \ ${attrs.rev} \ ${version} \ - ${shellEscape (toString buildFlags)} + ${lib.escapeShellArgs buildFlags} ''} ${lib.optionalString (type == "gem") '' |