mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-05-18 04:16:02 +00:00
Code Issues Wiki Activity

treewide: gnome3.libgee -> libgee

Browse source 
Fix building with `config.allowAliases = false;`.
This commit is contained in:
Samuel Gräfenstein 2021-03-16 18:30:03 +01:00
parent b72ee5775c
commit 0b9377822c
No known key found for this signature in database
GPG key ID: EF76A063F15C63C8
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/misc/regextester/default.nix
View file

@ -6,7 +6,7 @@
, pkg-config , pkg-config
, glib , glib
, gtk3 , gtk3
, gnome3 , libgee
, meson , meson
, ninja , ninja
, gobject-introspection , gobject-introspection
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
pantheon.elementary-icon-theme pantheon.elementary-icon-theme
pantheon.granite pantheon.granite
glib glib
gnome3.libgee libgee
gsettings-desktop-schemas gsettings-desktop-schemas
gtk3 gtk3
]; ];

4
pkgs/development/libraries/libhttpseverywhere/default.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, meson, ninja, makeFontsConf, vala, fetchpatch { 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 let
pname = "libhttpseverywhere"; pname = "libhttpseverywhere";
@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ vala gobject-introspection meson ninja pkg-config ]; 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 # Fixes build with vala >=0.42
patches = [ patches = [

4
pkgs/tools/security/gencfsm/default.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, autoconf, automake, intltool, libtool, pkg-config, encfs { 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 { stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ autoconf automake intltool libtool vala glib encfs 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 ]; wrapGAppsHook gobject-introspection ];
patches = [ ./makefile-mkdir.patch ]; patches = [ ./makefile-mkdir.patch ];