diff options
| author | Profpatsch <mail@profpatsch.de> | 2015-06-26 04:28:04 +0200 |
|---|---|---|
| committer | Rok Garbas <rok@garbas.si> | 2015-06-26 18:02:59 +0200 |
| commit | 62921384e059fcfb09755e4e98442c99a10f8d90 (patch) | |
| tree | 6a26a6dc51a459a493930f2d65d17aa0accbb2c1 /pkgs/tools/misc | |
| parent | 8c4fcc87f8320004e924f53bbaee29ae3b7b4692 (diff) | |
| download | nixlib-62921384e059fcfb09755e4e98442c99a10f8d90.tar nixlib-62921384e059fcfb09755e4e98442c99a10f8d90.tar.gz nixlib-62921384e059fcfb09755e4e98442c99a10f8d90.tar.bz2 nixlib-62921384e059fcfb09755e4e98442c99a10f8d90.tar.lz nixlib-62921384e059fcfb09755e4e98442c99a10f8d90.tar.xz nixlib-62921384e059fcfb09755e4e98442c99a10f8d90.tar.zst nixlib-62921384e059fcfb09755e4e98442c99a10f8d90.zip | |
stow: patch that removes warning for 2.2.0, closes #8513
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/stow/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/misc/stow/precedence-issue.patch | 15 |
2 files changed, 17 insertions, 0 deletions
diff --git a/pkgs/tools/misc/stow/default.nix b/pkgs/tools/misc/stow/default.nix index a9d8554525bd..6eddcf89b914 100644 --- a/pkgs/tools/misc/stow/default.nix +++ b/pkgs/tools/misc/stow/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation { buildInputs = [ perl perlPackages.TestOutput ]; + patches = [ ./precedence-issue.patch ]; + doCheck = true; meta = { diff --git a/pkgs/tools/misc/stow/precedence-issue.patch b/pkgs/tools/misc/stow/precedence-issue.patch new file mode 100644 index 000000000000..d9542573bac7 --- /dev/null +++ b/pkgs/tools/misc/stow/precedence-issue.patch @@ -0,0 +1,15 @@ +diff --git a/lib/Stow.pm.in b/lib/Stow.pm.in +index 101a422..f80b1ac 100755 +--- a/lib/Stow.pm.in ++++ b/lib/Stow.pm.in +@@ -1732,8 +1732,8 @@ sub read_a_link { + } + elsif (-l $path) { + debug(4, " read_a_link($path): real link"); +- return readlink $path +- or error("Could not read link: $path"); ++ my $target = readlink $path or error("Could not read link: $path ($!)"); ++ return $target; + } + internal_error("read_a_link() passed a non link path: $path\n"); + } |