From 81a2b58c393a49fb16581567ae8deddc25e5e2f1 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 23 Dec 2014 08:42:30 +0100 Subject: nixpkgs: remove redundant attribute `sip` Because: 1. It is a mere alias of `pythonPackages.sip` 2. It is usually not needed since propagated by `pyqt4` 3. It makes it easy to have a packages depend on two different versions of sip --- pkgs/applications/gis/qgis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/gis/qgis/default.nix') diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index 82f1bc382d71..231533e580ea 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, x11, sqlite, gsl, - pyqt4, qwt, fcgi, python, libspatialindex, libspatialite, sip }: + pyqt4, qwt, fcgi, python, libspatialindex, libspatialite }: stdenv.mkDerivation rec { name = "qgis-2.4.0"; - buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl pyqt4 sip qwt + buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl pyqt4 qwt fcgi libspatialindex libspatialite ]; nativeBuildInputs = [ cmake python ]; -- cgit 1.4.1