about summary refs log tree commit diff
path: root/pkgs/applications/gis/qgis/default.nix
diff options
context:
space:
mode:
authorVincent Laporte <Vincent.Laporte@gmail.com>2014-12-23 08:42:30 +0100
committerVincent Laporte <Vincent.Laporte@gmail.com>2014-12-23 19:37:21 +0100
commit81a2b58c393a49fb16581567ae8deddc25e5e2f1 (patch)
tree8f184eaca6c9bfcb13db196a47c9b0b28c35c15a /pkgs/applications/gis/qgis/default.nix
parent49f53f63f5b5ae771822f05f80d150068cb57284 (diff)
downloadnixlib-81a2b58c393a49fb16581567ae8deddc25e5e2f1.tar
nixlib-81a2b58c393a49fb16581567ae8deddc25e5e2f1.tar.gz
nixlib-81a2b58c393a49fb16581567ae8deddc25e5e2f1.tar.bz2
nixlib-81a2b58c393a49fb16581567ae8deddc25e5e2f1.tar.lz
nixlib-81a2b58c393a49fb16581567ae8deddc25e5e2f1.tar.xz
nixlib-81a2b58c393a49fb16581567ae8deddc25e5e2f1.tar.zst
nixlib-81a2b58c393a49fb16581567ae8deddc25e5e2f1.zip
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
Diffstat (limited to 'pkgs/applications/gis/qgis/default.nix')
-rw-r--r--pkgs/applications/gis/qgis/default.nix4
1 files changed, 2 insertions, 2 deletions
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 ];