diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-04-14 10:55:50 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-04-14 10:55:50 +0000 |
| commit | 98bab41c33d0ee7cf017db450b05951036277a24 (patch) | |
| tree | 513d5a7807dd6fc949858a553fcf44700fc0bbc7 /pkgs/servers/dict | |
| parent | 0cf1045be402506420393b3c90e0b7cbe36748ce (diff) | |
| download | nixpkgs-98bab41c33d0ee7cf017db450b05951036277a24.tar nixpkgs-98bab41c33d0ee7cf017db450b05951036277a24.tar.gz nixpkgs-98bab41c33d0ee7cf017db450b05951036277a24.tar.bz2 nixpkgs-98bab41c33d0ee7cf017db450b05951036277a24.tar.lz nixpkgs-98bab41c33d0ee7cf017db450b05951036277a24.tar.xz nixpkgs-98bab41c33d0ee7cf017db450b05951036277a24.tar.zst nixpkgs-98bab41c33d0ee7cf017db450b05951036277a24.zip | |
* Clean up the "dict" package. For some reason "configureFlags"
didn't get passed properly. svn path=/nixpkgs/trunk/; revision=21069
Diffstat (limited to 'pkgs/servers/dict')
| -rw-r--r-- | pkgs/servers/dict/1.9.15.nix | 22 | ||||
| -rw-r--r-- | pkgs/servers/dict/default.nix | 18 | ||||
| -rw-r--r-- | pkgs/servers/dict/freedict.nix | 4 |
3 files changed, 18 insertions, 26 deletions
diff --git a/pkgs/servers/dict/1.9.15.nix b/pkgs/servers/dict/1.9.15.nix deleted file mode 100644 index de9c4f7eeae..00000000000 --- a/pkgs/servers/dict/1.9.15.nix +++ /dev/null @@ -1,22 +0,0 @@ -args : with args; with builderDefs; - let localDefs = builderDefs.passthru.function ((rec { - src = /* put a fetchurl here */ - fetchurl { - url = mirror://sourceforge/dict/dictd-1.9.15.tar.gz; - sha256 = "0p41yf72l0igmshz6vxy3hm51z25600vrnb9j2jpgws4c03fqnac"; - }; - - buildInputs = [flex bison which]; - configureFlags = [ " --datadir=/var/run/current-system/share/dictd " ]; - }) // args); - in with localDefs; -stdenv.mkDerivation rec { - name = "dict-1.9.15"; - builder = writeScript (name + "-builder") - (textClosure localDefs - [doConfigure doMakeInstall doForceShare doPropagate]); - meta = { - description = "Dict protocol server and client"; - inherit src; - }; -} diff --git a/pkgs/servers/dict/default.nix b/pkgs/servers/dict/default.nix new file mode 100644 index 00000000000..0b78bb9ae94 --- /dev/null +++ b/pkgs/servers/dict/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, which, bison, flex }: + +stdenv.mkDerivation { + name = "dictd-1.9.15"; + + src = fetchurl { + url = mirror://sourceforge/dict/dictd-1.9.15.tar.gz; + sha256 = "0p41yf72l0igmshz6vxy3hm51z25600vrnb9j2jpgws4c03fqnac"; + }; + + buildInputs = [ flex bison which ]; + + configureFlags = "--datadir=/var/run/current-system/share/dictd"; + + meta = { + description = "Dict protocol server and client"; + }; +} diff --git a/pkgs/servers/dict/freedict.nix b/pkgs/servers/dict/freedict.nix deleted file mode 100644 index 2f62525f394..00000000000 --- a/pkgs/servers/dict/freedict.nix +++ /dev/null @@ -1,4 +0,0 @@ - fetchurl { - url = http://downloads.sourceforge.net/freedict/freedict-tools-0.2.tar.bz2; - sha256 = "0hai4rvyrsgagvwq8ahp8iwby77wr62whkkda2pkp8l6fp9sm2gd"; - }; |