[1/2] gnu: testdisk: Add optional dependencies.

Message ID 20160703162555.19342-1-rekado@elephly.net
State New
Headers

Commit Message

Ricardo Wurmus July 3, 2016, 4:25 p.m. UTC
  * gnu/packages/admin.scm (testdisk)[inputs]: Add ntfs-3g and libjpeg.
---
 gnu/packages/admin.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
  

Comments

Leo Famulari July 3, 2016, 8:22 p.m. UTC | #1
On Sun, Jul 03, 2016 at 06:25:54PM +0200, Ricardo Wurmus wrote:
> * gnu/packages/admin.scm (testdisk)[inputs]: Add ntfs-3g and libjpeg.
> ---
>  gnu/packages/admin.scm | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
> index 415a35a..2014ecb 100644
> --- a/gnu/packages/admin.scm
> +++ b/gnu/packages/admin.scm
> @@ -1149,9 +1149,11 @@ characters can be replaced as well, as can UTF-8 characters.")
>                  "0v1jap83f5h99zv01v3qmqm160d36n4ysi0gyq7xzb3mqgmw75x5"))))
>      (build-system gnu-build-system)
>      (inputs
> -     `(;; ("ntfs" ,ntfs)
> +     `(("ntfs-3g" ,ntfs-3g)
>         ("util-linux" ,util-linux)
>         ("openssl" ,openssl)
> +       ;; FIXME: add reiserfs
> +       ("libjpeg" ,libjpeg)

It already includes libjpeg ...

>         ("zlib" ,zlib)
>         ("e2fsprogs" ,e2fsprogs)
>         ("libjpeg" ,libjpeg)

... here ;)

So it should add ntfs-3g and the comment about reiserfs, right?
  
Ricardo Wurmus July 5, 2016, 7:25 a.m. UTC | #2
Leo Famulari <leo@famulari.name> writes:

> On Sun, Jul 03, 2016 at 06:25:54PM +0200, Ricardo Wurmus wrote:
>> * gnu/packages/admin.scm (testdisk)[inputs]: Add ntfs-3g and libjpeg.
>> ---
>>  gnu/packages/admin.scm | 4 +++-
>>  1 file changed, 3 insertions(+), 1 deletion(-)
>> 
>> diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
>> index 415a35a..2014ecb 100644
>> --- a/gnu/packages/admin.scm
>> +++ b/gnu/packages/admin.scm
>> @@ -1149,9 +1149,11 @@ characters can be replaced as well, as can UTF-8 characters.")
>>                  "0v1jap83f5h99zv01v3qmqm160d36n4ysi0gyq7xzb3mqgmw75x5"))))
>>      (build-system gnu-build-system)
>>      (inputs
>> -     `(;; ("ntfs" ,ntfs)
>> +     `(("ntfs-3g" ,ntfs-3g)
>>         ("util-linux" ,util-linux)
>>         ("openssl" ,openssl)
>> +       ;; FIXME: add reiserfs
>> +       ("libjpeg" ,libjpeg)
>
> It already includes libjpeg ...

Ah, I’m sorry.

>>         ("zlib" ,zlib)
>>         ("e2fsprogs" ,e2fsprogs)
>>         ("libjpeg" ,libjpeg)
>
> ... here ;)
>
> So it should add ntfs-3g and the comment about reiserfs, right?

Yes.  Fixed and pushed.  Thanks!

~~ Ricardo
  

Patch

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 415a35a..2014ecb 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -1149,9 +1149,11 @@  characters can be replaced as well, as can UTF-8 characters.")
                 "0v1jap83f5h99zv01v3qmqm160d36n4ysi0gyq7xzb3mqgmw75x5"))))
     (build-system gnu-build-system)
     (inputs
-     `(;; ("ntfs" ,ntfs)
+     `(("ntfs-3g" ,ntfs-3g)
        ("util-linux" ,util-linux)
        ("openssl" ,openssl)
+       ;; FIXME: add reiserfs
+       ("libjpeg" ,libjpeg)
        ("zlib" ,zlib)
        ("e2fsprogs" ,e2fsprogs)
        ("libjpeg" ,libjpeg)