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

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2018-07-21 19:43:53 +02:00
parent 8213ff161c cc218fc915
commit ad47d658d1
2090 changed files with 4329 additions and 3730 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/desktops/gnome-2/platform/gnome-vfs-monikers/default.nix
+1 -1
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, pkgconfig, glib, intltool, gnome_vfs, libbonobo, ORBit2}:
{stdenv, fetchurl, pkgconfig, glib, intltool, gnome_vfs, libbonobo}:
stdenv.mkDerivation {
name = "gnome-vfs-monikers-2.15.3";
pkgs/desktops/gnome-2/platform/libbonobo/default.nix
+1 -1
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, flex, bison, pkgconfig, glib, dbus-glib, libxml2, popt
{ stdenv, fetchurl, flex, bison, pkgconfig, glib, libxml2, popt
, intltool, ORBit2, procps }:
stdenv.mkDerivation rec {
pkgs/desktops/gnome-2/platform/libgnome/default.nix
+1 -1
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, glib, popt, zlib, libcanberra-gtk2
, intltool, libbonobo, GConf, gnome_vfs, ORBit2, libtool, libogg
, intltool, libbonobo, GConf, gnome_vfs, libtool, libogg
}:
stdenv.mkDerivation rec {