mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-28 09:53:10 +00:00
rubygems: ensure temporary directories are cleaned up
see #123718 Signed-off-by: Arthur Gautier <baloo@superbaloo.net>
This commit is contained in:
parent
8dcec3422e
commit
7b48454121
@ -12,7 +12,7 @@ let
|
|||||||
opString = lib.optionalString;
|
opString = lib.optionalString;
|
||||||
patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; };
|
patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; };
|
||||||
config = import ./config.nix { inherit fetchFromSavannah; };
|
config = import ./config.nix { inherit fetchFromSavannah; };
|
||||||
rubygems = import ./rubygems { inherit stdenv lib fetchurl; };
|
rubygems = import ./rubygems { inherit stdenv lib fetchurl fetchpatch; };
|
||||||
|
|
||||||
# Contains the ruby version heuristics
|
# Contains the ruby version heuristics
|
||||||
rubyVersion = import ./ruby-version.nix { inherit lib; };
|
rubyVersion = import ./ruby-version.nix { inherit lib; };
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ stdenv, lib, fetchurl }:
|
{ stdenv, lib, fetchurl, fetchpatch }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "rubygems";
|
name = "rubygems";
|
||||||
@ -13,6 +13,12 @@ stdenv.mkDerivation rec {
|
|||||||
./0001-add-post-extract-hook.patch
|
./0001-add-post-extract-hook.patch
|
||||||
./0002-binaries-with-env-shebang.patch
|
./0002-binaries-with-env-shebang.patch
|
||||||
./0003-gem-install-default-to-user.patch
|
./0003-gem-install-default-to-user.patch
|
||||||
|
# Ensure tmp directory are not left behind
|
||||||
|
# https://github.com/rubygems/rubygems/pull/4610
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/rubygems/rubygems/commit/2c2ffde6e4a9f7f571d38af687034fb8507a833d.patch";
|
||||||
|
sha256 = "sha256-bs2dXALKiJvMgk7lKjMx0NzGqlEqDYBBO35UrzNifms=";
|
||||||
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
|
Loading…
Reference in New Issue
Block a user