From 385ae7d2c4e6ee3b1470c5e02d7b24cf44e73a4b Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 18 Aug 2011 12:52:22 +0000 Subject: [PATCH] Let cups-pdf-filter use cups.src svn path=/nixpkgs/trunk/; revision=28652 --- pkgs/misc/cups/default.nix | 2 ++ 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 5aaa2c4aa2a..8a9efdedcf9 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 ab978068e17..50f117a6534 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 ];