public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/staging' into master

Browse Source
This commit is contained in:
Tuomas Tynkkynen
2016-11-30 00:34:23 +02:00
parent 56366b5e66 2587611ed5
commit 8a4d6516ee
102 changed files with 417 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/desktops/gnome-3/3.20/default.nix
View File

@@ -307,7 +307,7 @@ let
#### Dev http://ftp.gnome.org/pub/GNOME/devtools/
anjuta = callPackage ./devtools/anjuta { python=pkgs.python2; };
anjuta = callPackage ./devtools/anjuta { };
devhelp = callPackage ./devtools/devhelp { };

4
pkgs/desktops/gnome-3/3.20/devtools/anjuta/default.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, flex, bison, libxml2, intltool,
itstool, python, makeWrapper }:
itstool, python2, makeWrapper }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
buildInputs = [ pkgconfig flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl
gnome3.libgda gnome3.gtksourceview intltool itstool python makeWrapper
gnome3.libgda gnome3.gtksourceview intltool itstool python2 makeWrapper
gnome3.gsettings_desktop_schemas
];

4
pkgs/desktops/gnome-3/3.22/devtools/anjuta/default.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, flex, bison, libxml2, intltool,
itstool, python, makeWrapper }:
itstool, python2, makeWrapper }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
buildInputs = [ pkgconfig flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl
gnome3.libgda gnome3.gtksourceview intltool itstool python makeWrapper
gnome3.libgda gnome3.gtksourceview intltool itstool python2 makeWrapper
gnome3.gsettings_desktop_schemas
];