mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 13:41:26 +00:00
treewide: gnome3.libgee -> libgee
Fix building with `config.allowAliases = false;`.
This commit is contained in:
parent
b72ee5775c
commit
0b9377822c
|
@ -6,7 +6,7 @@
|
|||
, pkg-config
|
||||
, glib
|
||||
, gtk3
|
||||
, gnome3
|
||||
, libgee
|
||||
, meson
|
||||
, ninja
|
||||
, gobject-introspection
|
||||
|
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
|
|||
pantheon.elementary-icon-theme
|
||||
pantheon.granite
|
||||
glib
|
||||
gnome3.libgee
|
||||
libgee
|
||||
gsettings-desktop-schemas
|
||||
gtk3
|
||||
];
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, meson, ninja, makeFontsConf, vala, fetchpatch
|
||||
, gnome3, glib, json-glib, libarchive, libsoup, gobject-introspection }:
|
||||
, gnome3, libgee, glib, json-glib, libarchive, libsoup, gobject-introspection }:
|
||||
|
||||
let
|
||||
pname = "libhttpseverywhere";
|
||||
|
@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ vala gobject-introspection meson ninja pkg-config ];
|
||||
buildInputs = [ glib gnome3.libgee json-glib libsoup libarchive ];
|
||||
buildInputs = [ glib libgee json-glib libsoup libarchive ];
|
||||
|
||||
# Fixes build with vala >=0.42
|
||||
patches = [
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, fetchurl, autoconf, automake, intltool, libtool, pkg-config, encfs
|
||||
, glib , gnome3, gtk3, libgnome-keyring, vala, wrapGAppsHook, xorg, gobject-introspection
|
||||
, glib , libgee, gtk3, libgnome-keyring, vala, wrapGAppsHook, xorg, gobject-introspection
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ autoconf automake intltool libtool vala glib encfs
|
||||
gtk3 libgnome-keyring gnome3.libgee xorg.libSM xorg.libICE
|
||||
gtk3 libgnome-keyring libgee xorg.libSM xorg.libICE
|
||||
wrapGAppsHook gobject-introspection ];
|
||||
|
||||
patches = [ ./makefile-mkdir.patch ];
|
||||
|
|
Loading…
Reference in a new issue