diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-03-29 17:23:01 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-03-29 17:23:01 +0000 |
| commit | 12ae5363ea658d399bdb008f6ded3cde355f9310 (patch) | |
| tree | e2a2ab3210854bfaad01f955c32b1cda724a8790 /pkgs/applications/networking/mailreaders/sylpheed | |
| parent | bc71554fc80a760c3a8e01f9e9e97500aa9ccde1 (diff) | |
* Remove trivial builders.
* Make builders unexecutable by removing the hash-bang line and
execute permission.
* Convert calls to `derivation' to `mkDerivation'.
* Remove `system' and `stdenv' attributes from calls to
`mkDerivation'. These transformations were all done automatically,
so it is quite possible I broke stuff.
* Put the `mkDerivation' function in stdenv/generic.
svn path=/nixpkgs/trunk/; revision=874
Diffstat (limited to 'pkgs/applications/networking/mailreaders/sylpheed')
| -rw-r--r--[-rwxr-xr-x] | pkgs/applications/networking/mailreaders/sylpheed/builder.sh | 2 | ||||
| -rw-r--r-- | pkgs/applications/networking/mailreaders/sylpheed/default.nix | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/applications/networking/mailreaders/sylpheed/builder.sh b/pkgs/applications/networking/mailreaders/sylpheed/builder.sh index 061adef213a8..85da4ac19b21 100755..100644 --- a/pkgs/applications/networking/mailreaders/sylpheed/builder.sh +++ b/pkgs/applications/networking/mailreaders/sylpheed/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh -e - buildInputs="$gtk $gdkpixbuf $openssl" . $stdenv/setup diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix index b70b7ad17c5b..73ec1e6fb38c 100644 --- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix +++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix @@ -7,9 +7,8 @@ assert gtk != null; assert sslSupport -> openssl != null; assert imageSupport -> gdkpixbuf != null; -derivation { +stdenv.mkDerivation { name = "sylpheed-0.9.10"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { @@ -19,7 +18,7 @@ derivation { inherit sslSupport imageSupport; - inherit stdenv gtk; + inherit gtk; openssl = if sslSupport then openssl else null; gdkpixbuf = if imageSupport then gdkpixbuf else null; } |