diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-08-18 12:52:22 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-08-18 12:52:22 +0000 |
| commit | 385ae7d2c4e6ee3b1470c5e02d7b24cf44e73a4b (patch) | |
| tree | a9380c68d172fae73bc471e9f16936446d2ce231 /pkgs/misc/cups | |
| parent | e33a0c0a85b6366d20c10838b03197b2a95d9730 (diff) | |
Let cups-pdf-filter use cups.src
svn path=/nixpkgs/trunk/; revision=28652
Diffstat (limited to 'pkgs/misc/cups')
| -rw-r--r-- | pkgs/misc/cups/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/misc/cups/pdf-filter.nix | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 5aaa2c4aa2a44..8a9efdedcf97d 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -6,6 +6,8 @@ let version = "1.4.7"; in stdenv.mkDerivation { name = "cups-${version}"; + passthru = { inherit version; }; + src = fetchurl { url = "http://ftp.easysw.com/pub/cups/${version}/cups-${version}-source.tar.bz2"; sha256 = "1xlnkdqldq81pdqgisqbyh92k249bzz35m1f5bp4la06p00ksvjf"; diff --git a/pkgs/misc/cups/pdf-filter.nix b/pkgs/misc/cups/pdf-filter.nix index ab978068e175e..50f117a653414 100644 --- a/pkgs/misc/cups/pdf-filter.nix +++ b/pkgs/misc/cups/pdf-filter.nix @@ -1,14 +1,9 @@ { stdenv, fetchurl, pkgconfig, cups, poppler }: -let version = "1.4.5"; in - stdenv.mkDerivation { - name = "cups-pdf-filter-${version}"; + name = "cups-pdf-filter-${cups.version}"; - src = fetchurl { - url = "http://ftp.easysw.com/pub/cups/${version}/cups-${version}-source.tar.bz2"; - sha256 = "1zhf3hvx11i0qnbwyybmdhx4fxkxfd4ch69k59fj5bz8wvcdcl04"; - }; + inherit (cups) src; buildInputs = [ pkgconfig cups poppler ]; |