diff options
| author | Mark H Weaver <mhw@netris.org> | 2014-09-11 18:26:28 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2014-09-11 18:26:28 -0400 |
| commit | 66ea98e321e93b0806f6870d77dd4c00e7e720c0 (patch) | |
| tree | 21778401485e3b8683bbc6a31769233c059683b1 /gnu/packages/lua.scm | |
| parent | da5538ef44bfa74d3e435f9f557374eabba5dc1e (diff) | |
| parent | 5dae0186dea1e72e73bf223161620cfeddef5a63 (diff) | |
| download | patches-66ea98e321e93b0806f6870d77dd4c00e7e720c0.tar patches-66ea98e321e93b0806f6870d77dd4c00e7e720c0.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/image.scm
Diffstat (limited to 'gnu/packages/lua.scm')
| -rw-r--r-- | gnu/packages/lua.scm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index a85c120469..92ffc22c14 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -75,7 +75,8 @@ for configuration, scripting, and rapid prototyping.") (uri (string-append "http://www.lua.org/ftp/lua-" version ".tar.gz")) (sha256 - (base32 "0cskd4w0g6rdm2q8q3i4n1h3j8kylhs3rq8mxwl9vwlmlxbgqh16")))))) + (base32 "0cskd4w0g6rdm2q8q3i4n1h3j8kylhs3rq8mxwl9vwlmlxbgqh16")) + (patches (list (search-patch "lua51-liblua-so.patch"))))))) (define-public luajit (package |