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-19 18:24:24 +02:00
parent 9f208b5d8a e7e5aaa0b9
commit 8213ff161c
294 changed files with 61697 additions and 32101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/desktops/xfce/core/gtk-xfce-engine.nix
+8 -3
View File
@@ -1,4 +1,6 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk, withGtk3 ? false, gtk3 }:
{ stdenv, fetchurl, pkgconfig, intltool, gtk2, withGtk3 ? false, gtk3 ? null }:
assert withGtk3 -> (gtk3 != null);
stdenv.mkDerivation rec {
p_name = "gtk-xfce-engine";
@@ -12,8 +14,11 @@ stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool gtk ] ++ stdenv.lib.optional withGtk3 gtk3;
buildInputs = [ intltool gtk2 ] ++ stdenv.lib.optional withGtk3 gtk3;
# `glib-mkenums' is unhappy that some source files are not valid UTF-8
postPatch = ''find . -type f -name '*.[ch]' -exec sed -r -i 's/\xD6/O/g' {} +'';
configureFlags = stdenv.lib.optional withGtk3 "--enable-gtk3";
meta = {
pkgs/desktops/xfce/default.nix
+2 -1
View File
@@ -1,4 +1,4 @@
{ lib, pkgs }:
{ config, lib, pkgs }:
lib.makeScope pkgs.newScope (self: with self; {
#### NixOS support
@@ -159,6 +159,7 @@ lib.makeScope pkgs.newScope (self: with self; {
xfce4_power_manager_gtk3 = xfce4-power-manager.override { withGtk3 = true; };
} // lib.optionalAttrs (config.allowAliases or true) {
#### ALIASES - added 2018-01
terminal = xfce4-terminal;
pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, substituteAll, callPackage, pkgconfig, cmake, vala, libxml2,
glib, pcre, gtk2, gtk3, xorg, libxkbcommon, epoxy, at-spi2-core, dbus-glib, bamf,
xfce, libwnck3, libdbusmenu-glib, gobjectIntrospection }:
xfce, libwnck3, libdbusmenu, gobjectIntrospection }:
stdenv.mkDerivation rec {
name = "xfce4-vala-panel-appmenu-plugin-${version}";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
buildInputs = [ (callPackage ./appmenu-gtk-module.nix {})
glib pcre gtk2 gtk3 xorg.libpthreadstubs xorg.libXdmcp libxkbcommon epoxy
at-spi2-core dbus-glib bamf xfce.xfce4panel_gtk3 xfce.libxfce4util xfce.xfconf
libwnck3 libdbusmenu-glib gobjectIntrospection ];
libwnck3 libdbusmenu gobjectIntrospection ];
patches = [
(substituteAll {