b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix evaluation with config.allowAliases = false (#59879)

Browse source 
Co-Authored-By: volth <volth@webmaster.ms>
This commit is contained in:
Jan Tojnar 2019-04-19 15:14:03 +02:00 committed by GitHub
parent d36827bd08 5880baa9d0
commit cd8697da9f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/audio/audio-recorder/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl
, pkgconfig, intltool, gnome3
, pkgconfig, intltool
, glib, dbus, gtk3, libappindicator-gtk3, gst_all_1
, librsvg, wrapGAppsHook
, pulseaudioSupport ? true, libpulseaudio ? null }:
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
};
# https://bugs.launchpad.net/audio-recorder/+bug/1784622
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ];

2
pkgs/applications/misc/gnome-recipes/default.nix
View file

@ -55,7 +55,7 @@ in stdenv.mkDerivation rec {
# https://github.com/NixOS/nixpkgs/issues/36468
# https://gitlab.gnome.org/GNOME/recipes/issues/76
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
postPatch = ''
chmod +x src/list_to_c.py

4
pkgs/data/themes/materia-theme/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, gnome3, libxml2, gtk-engine-murrine, gdk_pixbuf, librsvg, bc }:
{ stdenv, fetchFromGitHub, gnome3, glib, libxml2, gtk-engine-murrine, gdk_pixbuf, librsvg, bc }:
stdenv.mkDerivation rec {
pname = "materia-theme";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1fpipwvwxjiriqhysqgx51rnax73hyd5jkyxhc2g3y73s5r2xq82";
};
nativeBuildInputs = [ gnome3.glib libxml2 bc ];
nativeBuildInputs = [ glib libxml2 bc ];
buildInputs = [ gnome3.gnome-themes-extra gdk_pixbuf librsvg ];

4
pkgs/desktops/mate/marco/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, libcanberra-gtk3, libgtop, gnome2, gnome3, gtk3, mate, wrapGAppsHook }:
{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, libcanberra-gtk3, libgtop, libstartup_notification, gnome3, gtk3, mate, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "marco-${version}";
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
libxml2
libcanberra-gtk3
libgtop
gnome2.startup_notification
libstartup_notification
gtk3
gnome3.zenity
];

4
pkgs/desktops/mate/mate-applets/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, gtk3, gtksourceview3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }:
{ stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, glib, gtk3, gtksourceview3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "mate-applets-${version}";
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
configureFlags = [ "--enable-suid=no" ];
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
meta = with stdenv.lib; {
description = "Applets for use with the MATE panel";

4
pkgs/misc/themes/equilux-theme/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, gnome3, libxml2, gtk-engine-murrine, gdk_pixbuf, librsvg, bc }:
{ stdenv, fetchFromGitHub, gnome3, glib, libxml2, gtk-engine-murrine, gdk_pixbuf, librsvg, bc }:
stdenv.mkDerivation rec {
name = "equilux-theme-${version}";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0lv2yyxhnmnkwxp576wnb01id4fp734b5z5n0l67sg5z7vc2h8fc";
};
nativeBuildInputs = [ gnome3.glib libxml2 bc ];
nativeBuildInputs = [ glib libxml2 bc ];
buildInputs = [ gnome3.gnome-themes-extra gdk_pixbuf librsvg ];