Merge pull request #116564 from samuelgrf/fix-allowAliases-false

This commit is contained in:
Sandro 2021-03-17 09:40:53 +01:00 committed by GitHub
commit 8bd2cea10b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
47 changed files with 94 additions and 92 deletions

View File

@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell #!/usr/bin/env nix-shell
#!nix-shell -i perl -p perl perlPackages.LWPProtocolhttps perlPackages.FileSlurp #!nix-shell -i perl -p perl perlPackages.LWPProtocolHttps perlPackages.FileSlurp
use strict; use strict;
use List::Util qw(reduce); use List::Util qw(reduce);

View File

@ -2,12 +2,12 @@
, pango, fribidi, harfbuzz, pcre, pkg-config , pango, fribidi, harfbuzz, pcre, pkg-config
, ncursesSupport ? true, ncurses ? null , ncursesSupport ? true, ncurses ? null
, waylandSupport ? true, wayland ? null, wayland-protocols ? null , waylandSupport ? true, wayland ? null, wayland-protocols ? null
, x11Support ? true, xlibs ? null, xorg ? null , x11Support ? true, xorg ? null
}: }:
assert ncursesSupport -> ncurses != null; assert ncursesSupport -> ncurses != null;
assert waylandSupport -> ! lib.elem null [wayland wayland-protocols]; assert waylandSupport -> ! lib.elem null [wayland wayland-protocols];
assert x11Support -> xlibs != null && xorg != null; assert x11Support -> xorg != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bemenu"; pname = "bemenu";
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
] ++ optional ncursesSupport ncurses ] ++ optional ncursesSupport ncurses
++ optionals waylandSupport [ wayland wayland-protocols ] ++ optionals waylandSupport [ wayland wayland-protocols ]
++ optionals x11Support [ ++ optionals x11Support [
xlibs.libX11 xlibs.libXinerama xlibs.libXft xorg.libX11 xorg.libXinerama xorg.libXft
xorg.libXdmcp xorg.libpthreadstubs xorg.libxcb xorg.libXdmcp xorg.libpthreadstubs xorg.libxcb
]; ];

View File

@ -5,7 +5,7 @@
let let
perlDeps = perlDeps =
[ perlPackages.MIMEtools perlPackages.HTMLParser ] [ perlPackages.MIMETools perlPackages.HTMLParser ]
++ lib.optional cursesSupport perlPackages.CursesUI ++ lib.optional cursesSupport perlPackages.CursesUI
++ lib.optional uriFindSupport perlPackages.URIFind; ++ lib.optional uriFindSupport perlPackages.URIFind;

View File

@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
JSON JSON
ImageExifTool ImageExifTool
librelative librelative
LWPUserAgent LWP
LWPProtocolHttps LWPProtocolHttps
MP3Info MP3Info
MP3Tag MP3Tag

View File

@ -25,7 +25,7 @@ appimageTools.wrapType2 rec {
multiPkgs = null; # no 32bit needed multiPkgs = null; # no 32bit needed
extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [
p.libsecret p.libsecret
p.xlibs.libxkbfile p.xorg.libxkbfile
]; ];
# Strip version from binary name. # Strip version from binary name.

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
]; ];

View File

@ -6,7 +6,7 @@
, jbig2dec , jbig2dec
, libjpeg , libjpeg
, mupdf , mupdf
, openjpeg_2 , openjpeg
, pkg-config , pkg-config
, zathura_core , zathura_core
}: }:
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
jbig2dec jbig2dec
libjpeg libjpeg
mupdf mupdf
openjpeg_2 openjpeg
zathura_core zathura_core
] ++ lib.optional stdenv.isDarwin gtk-mac-integration; ] ++ lib.optional stdenv.isDarwin gtk-mac-integration;

View File

@ -3,7 +3,7 @@
pkgs.mkShell { pkgs.mkShell {
buildInputs = [ buildInputs = [
pkgs.poetry2nix.cli pkgs.poetry2nix.cli
pkgs.pkgconfig pkgs.pkg-config
pkgs.libvirt pkgs.libvirt
pkgs.poetry pkgs.poetry
]; ];

View File

@ -4,7 +4,7 @@
, autoAwaySupport ? true, libXScrnSaver ? null, libX11 ? null , autoAwaySupport ? true, libXScrnSaver ? null, libX11 ? null
, notifySupport ? true, libnotify ? null, gdk-pixbuf ? null , notifySupport ? true, libnotify ? null, gdk-pixbuf ? null
, traySupport ? true, gnome2 ? null , traySupport ? true, gtk2 ? null
, pgpSupport ? true, gpgme ? null , pgpSupport ? true, gpgme ? null
, pythonPluginSupport ? true, python ? null , pythonPluginSupport ? true, python ? null
, omemoSupport ? true, libsignal-protocol-c ? null, libgcrypt ? null , omemoSupport ? true, libsignal-protocol-c ? null, libgcrypt ? null
@ -12,7 +12,7 @@
assert autoAwaySupport -> libXScrnSaver != null && libX11 != null; assert autoAwaySupport -> libXScrnSaver != null && libX11 != null;
assert notifySupport -> libnotify != null && gdk-pixbuf != null; assert notifySupport -> libnotify != null && gdk-pixbuf != null;
assert traySupport -> gnome2 != null; assert traySupport -> gtk2 != null;
assert pgpSupport -> gpgme != null; assert pgpSupport -> gpgme != null;
assert pythonPluginSupport -> python != null; assert pythonPluginSupport -> python != null;
assert omemoSupport -> libsignal-protocol-c != null && libgcrypt != null; assert omemoSupport -> libsignal-protocol-c != null && libgcrypt != null;
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
curl libmesode cmocka libmicrohttpd sqlite curl libmesode cmocka libmicrohttpd sqlite
] ++ optionals autoAwaySupport [ libXScrnSaver libX11 ] ] ++ optionals autoAwaySupport [ libXScrnSaver libX11 ]
++ optionals notifySupport [ libnotify gdk-pixbuf ] ++ optionals notifySupport [ libnotify gdk-pixbuf ]
++ optionals traySupport [ gnome2.gtk ] ++ optionals traySupport [ gtk2 ]
++ optionals pgpSupport [ gpgme ] ++ optionals pgpSupport [ gpgme ]
++ optionals pythonPluginSupport [ python ] ++ optionals pythonPluginSupport [ python ]
++ optionals omemoSupport [ libsignal-protocol-c libgcrypt ]; ++ optionals omemoSupport [ libsignal-protocol-c libgcrypt ];

View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, dpkg, alsaLib, atk, cairo, cups, dbus, expat, fontconfig { lib, stdenv, fetchurl, dpkg, alsaLib, atk, cairo, cups, dbus, expat, fontconfig
, freetype, gdk-pixbuf, glib, gnome2, nspr, nss, pango, udev, xorg }: , freetype, gdk-pixbuf, glib, gnome2, gtk2, nspr, nss, pango, udev, xorg }:
let let
fullPath = lib.makeLibraryPath [ fullPath = lib.makeLibraryPath [
alsaLib alsaLib
@ -13,7 +13,7 @@ let
gdk-pixbuf gdk-pixbuf
glib glib
gnome2.GConf gnome2.GConf
gnome2.gtk gtk2
nspr nspr
nss nss
pango pango

View File

@ -28,7 +28,7 @@ perlPackages.buildPerlPackage rec {
propagatedBuildInputs = [ openssl ]; propagatedBuildInputs = [ openssl ];
checkInputs = with perlPackages; [ TestDeep TestMore ]; checkInputs = with perlPackages; [ TestDeep ];
postPatch = '' postPatch = ''
patchShebangs script/convos patchShebangs script/convos

View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl { stdenv, fetchurl
, gnome3 , glade
, gnunet , gnunet
, gnutls , gnutls
, gtk3 , gtk3
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
gnome3.glade glade
gnunet gnunet
gnutls gnutls
gtk3 gtk3

View File

@ -12,7 +12,7 @@
, pcre , pcre
# Build options # Build options
, enableGTK3 ? false , enableGTK3 ? false
, gnome3 , gtk3
, xorg , xorg
, wrapGAppsHook , wrapGAppsHook
, enableQt ? false , enableQt ? false
@ -65,7 +65,7 @@ in stdenv.mkDerivation {
pcre pcre
] ]
++ lib.optionals enableQt [ qt5.qttools qt5.qtbase ] ++ lib.optionals enableQt [ qt5.qttools qt5.qtbase ]
++ lib.optionals enableGTK3 [ gnome3.gtk xorg.libpthreadstubs ] ++ lib.optionals enableGTK3 [ gtk3 xorg.libpthreadstubs ]
++ lib.optionals enableSystemd [ systemd ] ++ lib.optionals enableSystemd [ systemd ]
++ lib.optionals stdenv.isLinux [ inotify-tools ] ++ lib.optionals stdenv.isLinux [ inotify-tools ]
; ;

View File

@ -21,7 +21,7 @@
# Runtime dependencies; # Runtime dependencies;
# A few additional ones (e.g. Node) are already shipped together with the # A few additional ones (e.g. Node) are already shipped together with the
# AppImage, so we don't have to duplicate them here. # AppImage, so we don't have to duplicate them here.
alsaLib, dbus-glib, fuse, gnome3, libdbusmenu-gtk2, udev, nss alsaLib, dbus-glib, fuse, gnome3, gtk3, libdbusmenu-gtk2, udev, nss
}: }:
let let
@ -56,7 +56,7 @@ in stdenv.mkDerivation {
alsaLib alsaLib
dbus-glib dbus-glib
fuse fuse
gnome3.gtk gtk3
libdbusmenu-gtk2 libdbusmenu-gtk2
nss nss
udev udev
@ -92,7 +92,7 @@ in stdenv.mkDerivation {
# This is required for the file picker dialog - otherwise pcloud just # This is required for the file picker dialog - otherwise pcloud just
# crashes # crashes
export XDG_DATA_DIRS="${gnome3.gsettings-desktop-schemas}/share/gsettings-schemas/${gnome3.gsettings-desktop-schemas.name}:${gnome3.gtk}/share/gsettings-schemas/${gnome3.gtk.name}:$XDG_DATA_DIRS" export XDG_DATA_DIRS="${gnome3.gsettings-desktop-schemas}/share/gsettings-schemas/${gnome3.gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS"
exec "$out/app/pcloud" exec "$out/app/pcloud"
EOF EOF

View File

@ -15,7 +15,7 @@
, gdk-pixbuf , gdk-pixbuf
, glib , glib
, glibc , glibc
, gnome3 , gsettings-desktop-schemas
, gst_all_1 , gst_all_1
, gtk2 , gtk2
, gtk3 , gtk3
@ -95,7 +95,7 @@ in stdenv.mkDerivation rec {
fontconfig fontconfig
gdk-pixbuf gdk-pixbuf
glib glib
gnome3.gsettings_desktop_schemas gsettings-desktop-schemas
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-base
gst_all_1.gstreamer gst_all_1.gstreamer
gtk2 gtk2

View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config { lib, stdenv, fetchFromGitHub, cmake, pkg-config
, mpg123, SDL2, gnome3, faad2, pcre , mpg123, SDL2, gtkmm3, faad2, pcre
} : } :
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ faad2 mpg123 SDL2 gnome3.gtkmm pcre ]; buildInputs = [ faad2 mpg123 SDL2 gtkmm3 pcre ];
meta = with lib; { meta = with lib; {
description = "Play DAB/DAB+ from ETI-NI aligned stream"; description = "Play DAB/DAB+ from ETI-NI aligned stream";

View File

@ -6,7 +6,7 @@
, epoxy , epoxy
, fetchFromGitHub , fetchFromGitHub
, glm , glm
, gnome3 , gtkmm3
, lib , lib
, libgit2 , libgit2
, librsvg , librsvg
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
curl curl
epoxy epoxy
glm glm
gnome3.gtkmm gtkmm3
libgit2 libgit2
librsvg librsvg
libuuid libuuid

View File

@ -1,6 +1,7 @@
{ lib, stdenv { lib, stdenv
, fetchFromGitLab , fetchFromGitLab
, gnome3 , gnome3
, dconf
, wxGTK30 , wxGTK30
, wxGTK31 , wxGTK31
, makeWrapper , makeWrapper
@ -186,12 +187,12 @@ stdenv.mkDerivation rec {
makeWrapperArgs = with passthru.libraries; [ makeWrapperArgs = with passthru.libraries; [
"--prefix XDG_DATA_DIRS : ${base}/share" "--prefix XDG_DATA_DIRS : ${base}/share"
"--prefix XDG_DATA_DIRS : ${hicolor-icon-theme}/share" "--prefix XDG_DATA_DIRS : ${hicolor-icon-theme}/share"
"--prefix XDG_DATA_DIRS : ${gnome3.defaultIconTheme}/share" "--prefix XDG_DATA_DIRS : ${gnome3.adwaita-icon-theme}/share"
"--prefix XDG_DATA_DIRS : ${wxGTK.gtk}/share/gsettings-schemas/${wxGTK.gtk.name}" "--prefix XDG_DATA_DIRS : ${wxGTK.gtk}/share/gsettings-schemas/${wxGTK.gtk.name}"
"--prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" "--prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}"
# wrapGAppsHook did these two as well, no idea if it matters... # wrapGAppsHook did these two as well, no idea if it matters...
"--prefix XDG_DATA_DIRS : ${cups}/share" "--prefix XDG_DATA_DIRS : ${cups}/share"
"--prefix GIO_EXTRA_MODULES : ${gnome3.dconf}/lib/gio/modules" "--prefix GIO_EXTRA_MODULES : ${dconf}/lib/gio/modules"
"--set-default KISYSMOD ${footprints}/share/kicad/modules" "--set-default KISYSMOD ${footprints}/share/kicad/modules"
"--set-default KICAD_SYMBOL_DIR ${symbols}/share/kicad/library" "--set-default KICAD_SYMBOL_DIR ${symbols}/share/kicad/library"

View File

@ -127,7 +127,7 @@ self = stdenv.mkDerivation {
buildInputs = [ ncurses ] ++ ocamlBuildInputs buildInputs = [ ncurses ] ++ ocamlBuildInputs
++ optionals buildIde ++ optionals buildIde
(if versionAtLeast "8.10" (if versionAtLeast "8.10"
then [ ocamlPackages.lablgtk3-sourceview3 glib gnome3.defaultIconTheme wrapGAppsHook ] then [ ocamlPackages.lablgtk3-sourceview3 glib gnome3.adwaita-icon-theme wrapGAppsHook ]
else [ ocamlPackages.lablgtk ]); else [ ocamlPackages.lablgtk ]);
postPatch = '' postPatch = ''

View File

@ -5,6 +5,7 @@
, pkg-config , pkg-config
, autoreconfHook , autoreconfHook
, gnome2 , gnome2
, gtk2
, glib , glib
, libtifiles2 , libtifiles2
, libticables2 , libticables2
@ -32,7 +33,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
gnome2.gtk gtk2
gnome2.libglade gnome2.libglade
glib glib
libtifiles2 libtifiles2

View File

@ -7,6 +7,7 @@
, intltool , intltool
, glib , glib
, gnome2 , gnome2
, gtk2
, gfm , gfm
, libticables2 , libticables2
, libticalcs2 , libticalcs2
@ -36,7 +37,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
glib glib
gnome2.gtk gtk2
gnome2.libglade gnome2.libglade
gfm gfm
libticables2 libticables2

View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchgit, makeWrapper, pkg-config, { lib, stdenv, fetchgit, makeWrapper, pkg-config,
gnome2, glib, pango, cairo, gdk-pixbuf, atk, freetype, xorg, gnome2, gtk2, glib, pango, cairo, gdk-pixbuf, atk, freetype, xorg,
configH ? "" configH ? ""
}: }:
@ -14,7 +14,7 @@ stdenv.mkDerivation {
}; };
buildInputs = [ buildInputs = [
gnome2.vte glib pango gnome2.gtk cairo gdk-pixbuf atk freetype xorg.libX11 gnome2.vte glib pango gtk2 cairo gdk-pixbuf atk freetype xorg.libX11
xorg.xorgproto xorg.libXext makeWrapper pkg-config xorg.xorgproto xorg.libXext makeWrapper pkg-config
]; ];

View File

@ -4,6 +4,7 @@
, fetchFromGitLab , fetchFromGitLab
, gettext , gettext
, gnome3 , gnome3
, libgtop
, gtk3 , gtk3
, libhandy , libhandy
, pcre2 , pcre2
@ -33,7 +34,7 @@ stdenv.mkDerivation {
buildInputs = [ buildInputs = [
gettext gettext
gnome3.libgtop libgtop
gnome3.nautilus gnome3.nautilus
gtk3 gtk3
libhandy libhandy

View File

@ -1,6 +1,6 @@
{ {
alsaLib, atk, cairo, cups, dbus, dpkg, expat, fetchurl, fetchzip, fontconfig, freetype, alsaLib, atk, cairo, cups, dbus, dpkg, expat, fetchurl, fetchzip, fontconfig, freetype,
gdk-pixbuf, glib, gnome3, libX11, libXScrnSaver, libXcomposite, libXcursor, gdk-pixbuf, glib, gtk3, libX11, libXScrnSaver, libXcomposite, libXcursor,
libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst,
libxcb, nspr, nss, lib, stdenv, udev, libuuid, pango, at-spi2-atk, at-spi2-core libxcb, nspr, nss, lib, stdenv, udev, libuuid, pango, at-spi2-atk, at-spi2-core
}: }:
@ -19,7 +19,7 @@
freetype freetype
gdk-pixbuf gdk-pixbuf
glib glib
gnome3.gtk gtk3
pango pango
libuuid libuuid
libX11 libX11

View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, meson, ninja, pkg-config, wayland, wrapGAppsHook { stdenv, lib, fetchurl, meson, ninja, pkg-config, wayland, wrapGAppsHook
, gnome3, libevdev, libxml2, wayfire, wayland-protocols, wf-config, wf-shell , gtk3, libevdev, libxml2, wayfire, wayland-protocols, wf-config, wf-shell
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkg-config wayland wrapGAppsHook ]; nativeBuildInputs = [ meson ninja pkg-config wayland wrapGAppsHook ];
buildInputs = [ buildInputs = [
gnome3.gtk libevdev libxml2 wayfire wayland gtk3 libevdev libxml2 wayfire wayland
wayland-protocols wf-config wf-shell wayland-protocols wf-config wf-shell
]; ];

View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, meson, ninja, pkg-config, wayland, git { stdenv, lib, fetchurl, meson, ninja, pkg-config, wayland, git
, alsaLib, gnome3, gtk-layer-shell, pulseaudio, wayfire, wf-config , alsaLib, gtkmm3, gtk-layer-shell, pulseaudio, wayfire, wf-config
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkg-config wayland ]; nativeBuildInputs = [ meson ninja pkg-config wayland ];
buildInputs = [ buildInputs = [
alsaLib gnome3.gtkmm gtk-layer-shell pulseaudio wayfire wf-config alsaLib gtkmm3 gtk-layer-shell pulseaudio wayfire wf-config
]; ];
mesonFlags = [ "--sysconfdir" "/etc" ]; mesonFlags = [ "--sysconfdir" "/etc" ];

View File

@ -1,6 +1,6 @@
{ config, lib, stdenv, fetchurl, pkg-config, libtool { config, lib, stdenv, fetchurl, pkg-config, libtool
, zip, libffi, libsigsegv, readline, gmp , zip, libffi, libsigsegv, readline, gmp
, gnutls, gnome2, cairo, SDL, sqlite , gnutls, gtk2, cairo, SDL, sqlite
, emacsSupport ? config.emacsSupport or false, emacs ? null }: , emacsSupport ? config.emacsSupport or false, emacs ? null }:
assert emacsSupport -> (emacs != null); assert emacsSupport -> (emacs != null);
@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
# http://smalltalk.gnu.org/download # http://smalltalk.gnu.org/download
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ buildInputs = [
libtool zip libffi libsigsegv-shared readline gmp gnutls gnome2.gtk libtool zip libffi libsigsegv-shared readline gmp gnutls gtk2
cairo SDL sqlite cairo SDL sqlite
] ]
++ lib.optional emacsSupport emacs; ++ lib.optional emacsSupport emacs;

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 = [

View File

@ -225,7 +225,7 @@ $out/lib/common-lisp/query-fs"
x.deps; x.deps;
}; };
cl-cffi-gtk-glib = addNativeLibs [pkgs.glib]; cl-cffi-gtk-glib = addNativeLibs [pkgs.glib];
cl-cffi-gtk-gdk-pixbuf = addNativeLibs [pkgs.gdk_pixbuf]; cl-cffi-gtk-gdk-pixbuf = addNativeLibs [pkgs.gdk-pixbuf];
cl-cffi-gtk-cairo = addNativeLibs [pkgs.cairo]; cl-cffi-gtk-cairo = addNativeLibs [pkgs.cairo];
cl-cffi-gtk-pango = addNativeLibs [pkgs.pango]; cl-cffi-gtk-pango = addNativeLibs [pkgs.pango];
cl-cffi-gtk-gdk = addNativeLibs [pkgs.gtk3]; cl-cffi-gtk-gdk = addNativeLibs [pkgs.gtk3];

View File

@ -11,6 +11,6 @@ self = rec {
lispPackages.quicklisp-to-nix lispPackages.quicklisp-to-nix-system-info lispPackages.quicklisp-to-nix lispPackages.quicklisp-to-nix-system-info
]; ];
CPATH = "${libfixposix}/include"; CPATH = "${libfixposix}/include";
LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${libmysqlclient}/lib:${libmysqlclient}/lib/mysql:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib:${openssl_lib_marked}/lib:${glib.out}/lib:${gdk_pixbuf}/lib:${cairo}/lib:${pango.out}/lib:${gtk3}/lib:${webkitgtk}/lib"; LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${libmysqlclient}/lib:${libmysqlclient}/lib/mysql:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib:${openssl_lib_marked}/lib:${glib.out}/lib:${gdk-pixbuf}/lib:${cairo}/lib:${pango.out}/lib:${gtk3}/lib:${webkitgtk}/lib";
}; };
in stdenv.mkDerivation self in stdenv.mkDerivation self

View File

@ -5,16 +5,16 @@ deployAndroidPackage {
buildInputs = [ autoPatchelfHook makeWrapper ] buildInputs = [ autoPatchelfHook makeWrapper ]
++ lib.optional (os == "linux") [ ++ lib.optional (os == "linux") [
pkgs.glibc pkgs.glibc
pkgs.xlibs.libX11 pkgs.xorg.libX11
pkgs.xlibs.libXext pkgs.xorg.libXext
pkgs.xlibs.libXdamage pkgs.xorg.libXdamage
pkgs.xlibs.libXfixes pkgs.xorg.libXfixes
pkgs.xlibs.libxcb pkgs.xorg.libxcb
pkgs.xlibs.libXcomposite pkgs.xorg.libXcomposite
pkgs.xlibs.libXcursor pkgs.xorg.libXcursor
pkgs.xlibs.libXi pkgs.xorg.libXi
pkgs.xlibs.libXrender pkgs.xorg.libXrender
pkgs.xlibs.libXtst pkgs.xorg.libXtst
pkgs.libcxx pkgs.libcxx
pkgs.libGL pkgs.libGL
pkgs.libpulseaudio pkgs.libpulseaudio

View File

@ -4,7 +4,7 @@ deployAndroidPackage {
name = "androidsdk"; name = "androidsdk";
inherit os package; inherit os package;
buildInputs = [ autoPatchelfHook makeWrapper ] buildInputs = [ autoPatchelfHook makeWrapper ]
++ lib.optional (os == "linux") [ pkgs.glibc pkgs.xlibs.libX11 pkgs.xlibs.libXrender pkgs.xlibs.libXext pkgs.fontconfig pkgs.freetype pkgs_i686.glibc pkgs_i686.xlibs.libX11 pkgs_i686.xlibs.libXrender pkgs_i686.xlibs.libXext pkgs_i686.fontconfig.lib pkgs_i686.freetype pkgs_i686.zlib pkgs.fontconfig.lib ]; ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.xorg.libX11 pkgs.xorg.libXrender pkgs.xorg.libXext pkgs.fontconfig pkgs.freetype pkgs_i686.glibc pkgs_i686.xorg.libX11 pkgs_i686.xorg.libXrender pkgs_i686.xorg.libXext pkgs_i686.fontconfig.lib pkgs_i686.freetype pkgs_i686.zlib pkgs.fontconfig.lib ];
patchInstructions = '' patchInstructions = ''
${lib.optionalString (os == "linux") '' ${lib.optionalString (os == "linux") ''
@ -27,7 +27,7 @@ deployAndroidPackage {
# Wrap monitor script # Wrap monitor script
wrapProgram $PWD/monitor \ wrapProgram $PWD/monitor \
--prefix PATH : ${pkgs.jdk8}/bin \ --prefix PATH : ${pkgs.jdk8}/bin \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.xlibs.libX11 pkgs.xlibs.libXtst ]} --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.xorg.libX11 pkgs.xorg.libXtst ]}
# Patch all script shebangs # Patch all script shebangs
patchShebangs . patchShebangs .

View File

@ -107,7 +107,7 @@ let
mirakurun = super.mirakurun.override rec { mirakurun = super.mirakurun.override rec {
nativeBuildInputs = with pkgs; [ makeWrapper ]; nativeBuildInputs = with pkgs; [ makeWrapper ];
postInstall = let postInstall = let
runtimeDeps = [ nodejs ] ++ (with pkgs; [ bash which v4l_utils ]); runtimeDeps = [ nodejs ] ++ (with pkgs; [ bash which v4l-utils ]);
in in
'' ''
substituteInPlace $out/lib/node_modules/mirakurun/processes.json \ substituteInPlace $out/lib/node_modules/mirakurun/processes.json \

View File

@ -27,7 +27,7 @@ stdenv.mkDerivation {
configure configure
''; '';
nativeBuildInputs = [ pkgs.pkgconfig ]; nativeBuildInputs = [ pkgs.pkg-config ];
buildInputs = [ python pygobject2 pygtk pkgs.libnotify pkgs.glib pkgs.gtk2 pkgs.dbus-glib ]; buildInputs = [ python pygobject2 pygtk pkgs.libnotify pkgs.glib pkgs.gtk2 pkgs.dbus-glib ];
postInstall = "cd $out/lib/python*/site-packages && ln -s gtk-*/pynotify ."; postInstall = "cd $out/lib/python*/site-packages && ln -s gtk-*/pynotify .";

View File

@ -26,7 +26,7 @@ buildPythonPackage rec {
patchShebangs . patchShebangs .
''; '';
nativeBuildInputs = [ nose pkgs.pkgconfig pkgs.swig ]; nativeBuildInputs = [ nose pkgs.pkg-config pkgs.swig ];
buildInputs = [ setuptools pkgs.libcdio ] buildInputs = [ setuptools pkgs.libcdio ]
++ lib.optional stdenv.isDarwin pkgs.libiconv; ++ lib.optional stdenv.isDarwin pkgs.libiconv;

View File

@ -38,7 +38,7 @@ buildPythonPackage rec {
PATH="${pkgs.parted}/sbin:$PATH" PATH="${pkgs.parted}/sbin:$PATH"
''; '';
nativeBuildInputs = [ pkgs.pkgconfig ]; nativeBuildInputs = [ pkgs.pkg-config ];
checkInputs = [ six ]; checkInputs = [ six ];
propagatedBuildInputs = [ pkgs.parted ]; propagatedBuildInputs = [ pkgs.parted ];

View File

@ -17,7 +17,7 @@ buildPythonPackage rec {
}; };
NIX_CFLAGS_COMPILE="-I${pkgs.poppler.dev}/include/poppler/"; NIX_CFLAGS_COMPILE="-I${pkgs.poppler.dev}/include/poppler/";
nativeBuildInputs = [ pkgs.pkgconfig ]; nativeBuildInputs = [ pkgs.pkg-config ];
buildInputs = [ pkgs.poppler.dev ]; buildInputs = [ pkgs.poppler.dev ];
propagatedBuildInputs = [ pycairo pygobject2 ]; propagatedBuildInputs = [ pycairo pygobject2 ];

View File

@ -1,7 +1,7 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, saneBackends , sane-backends
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -15,7 +15,7 @@ buildPythonPackage rec {
}; };
buildInputs = [ buildInputs = [
saneBackends sane-backends
]; ];
meta = with lib; { meta = with lib; {

View File

@ -231,7 +231,7 @@ let
}; };
packagesWithNativeBuildInputs = { packagesWithNativeBuildInputs = {
arrow = [ pkgs.pkgconfig pkgs.arrow-cpp ]; arrow = [ pkgs.pkg-config pkgs.arrow-cpp ];
adimpro = [ pkgs.imagemagick ]; adimpro = [ pkgs.imagemagick ];
animation = [ pkgs.which ]; animation = [ pkgs.which ];
audio = [ pkgs.portaudio ]; audio = [ pkgs.portaudio ];

View File

@ -313,7 +313,7 @@ self: super:
nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ]; nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ];
buildInputs = buildInputs =
(old.buildInputs or [ ]) (old.buildInputs or [ ])
++ [ pkgs.hdf5 self.pkgconfig self.cython ] ++ [ pkgs.hdf5 self.pkg-config self.cython ]
++ lib.optional mpiSupport mpi ++ lib.optional mpiSupport mpi
; ;
propagatedBuildInputs = propagatedBuildInputs =
@ -453,7 +453,7 @@ self: super:
); );
jsonslicer = super.jsonslicer.overridePythonAttrs (old: { jsonslicer = super.jsonslicer.overridePythonAttrs (old: {
nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkgconfig ]; nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ];
buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.yajl ]; buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.yajl ];
}); });

View File

@ -3,7 +3,7 @@
, lib , lib
, pkg-config , pkg-config
, glib , glib
, gnome2 , gtk2
, libticonv , libticonv
, libtifiles2 , libtifiles2
, libticables2 , libticables2
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
sha256 = "1ba38xzhp3yf21ip3cgql6jzy49jc34sfnjsl4syxyrd81d269zw"; sha256 = "1ba38xzhp3yf21ip3cgql6jzy49jc34sfnjsl4syxyrd81d269zw";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ glib gnome2.gtk libticonv libtifiles2 libticables2 libticalcs2 ]; buildInputs = [ glib gtk2 libticonv libtifiles2 libticables2 libticalcs2 ];
NIX_CFLAGS_COMPILE = [ "-lm" ]; NIX_CFLAGS_COMPILE = [ "-lm" ];
meta = with lib; { meta = with lib; {
homepage = "http://lpg.ticalc.org/prj_tilem/"; homepage = "http://lpg.ticalc.org/prj_tilem/";

View File

@ -12,7 +12,6 @@ let
DBI DBI
DateTimeFormatMail DateTimeFormatMail
DateTimeTimeZone DateTimeTimeZone
DigestMD5
Encode Encode
FCGI FCGI
FileCopyRecursive FileCopyRecursive
@ -28,7 +27,6 @@ let
libintl_perl libintl_perl
MHonArc MHonArc
MIMEBase64
MIMECharset MIMECharset
MIMETools MIMETools
MIMEEncWords MIMEEncWords
@ -56,8 +54,8 @@ let
IOSocketSSL IOSocketSSL
MailDKIM MailDKIM
NetDNS NetDNS
NetLDAP perlldap
NetSMTP libnet
SOAPLite SOAPLite
]); ]);
in in

View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, glib, libxml2, flex, bison, vips, gnome2, { lib, stdenv, fetchurl, pkg-config, glib, libxml2, flex, bison, vips, gtk2
fftw, gsl, goffice, libgsf }: , fftw, gsl, goffice, libgsf }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "nip2"; pname = "nip2";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ pkg-config glib libxml2 flex bison vips [ pkg-config glib libxml2 flex bison vips
gnome2.gtk fftw gsl goffice libgsf gtk2 fftw gsl goffice libgsf
]; ];
meta = with lib; { meta = with lib; {

View File

@ -6,7 +6,7 @@ perlPackages.buildPerlPackage rec {
url = "https://bitbucket.org/mahlon/shelldap/downloads/shelldap-${version}.tar.gz"; url = "https://bitbucket.org/mahlon/shelldap/downloads/shelldap-${version}.tar.gz";
sha256 = "07gkvvxcgw3pgkfy8p9mmidakciaq1rsq5zhmdqd8zcwgqkrr24i"; sha256 = "07gkvvxcgw3pgkfy8p9mmidakciaq1rsq5zhmdqd8zcwgqkrr24i";
}; };
buildInputs = with perlPackages; [ perl YAMLSyck NetLDAP AlgorithmDiff IOSocketSSL AuthenSASL TermReadLineGnu TermShell ]; buildInputs = with perlPackages; [ perl YAMLSyck perlldap AlgorithmDiff IOSocketSSL AuthenSASL TermReadLineGnu TermShell ];
prePatch = '' prePatch = ''
touch Makefile.PL touch Makefile.PL
''; '';

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 ];

View File

@ -1843,8 +1843,8 @@ let
url = "mirror://cpan/authors/id/I/IL/ILMARI/Catalyst-Authentication-Store-LDAP-1.016.tar.gz"; url = "mirror://cpan/authors/id/I/IL/ILMARI/Catalyst-Authentication-Store-LDAP-1.016.tar.gz";
sha256 = "0cm399vxqqf05cjgs1j5v3sk4qc6nmws5nfhf52qvpbwc4m82mq8"; sha256 = "0cm399vxqqf05cjgs1j5v3sk4qc6nmws5nfhf52qvpbwc4m82mq8";
}; };
propagatedBuildInputs = [ NetLDAP CatalystPluginAuthentication ClassAccessorFast ]; propagatedBuildInputs = [ perlldap CatalystPluginAuthentication ClassAccessor ];
buildInputs = [ TestMore TestMockObject TestException NetLDAPServerTest ]; buildInputs = [ TestMockObject TestException NetLDAPServerTest ];
meta = { meta = {
description= "Authentication from an LDAP Directory"; description= "Authentication from an LDAP Directory";
license = with lib.licenses; [ artistic1 ]; license = with lib.licenses; [ artistic1 ];
@ -14866,7 +14866,7 @@ let
url = "mirror://cpan/authors/id/E/ES/ESTRABD/MySQL-Diff-0.60.tar.gz"; url = "mirror://cpan/authors/id/E/ES/ESTRABD/MySQL-Diff-0.60.tar.gz";
sha256 = "5d7080a4bd5714ff9ef536aa774a7adb3c6f0e760215ca6c39d8a3545344f956"; sha256 = "5d7080a4bd5714ff9ef536aa774a7adb3c6f0e760215ca6c39d8a3545344f956";
}; };
propagatedBuildInputs = [ pkgs.mysql-client FileSlurp StringShellQuote ]; propagatedBuildInputs = [ pkgs.mariadb.client FileSlurp StringShellQuote ];
meta = { meta = {
homepage = "https://github.com/estrabd/mysqldiff"; homepage = "https://github.com/estrabd/mysqldiff";
description = "Generates a database upgrade instruction set"; description = "Generates a database upgrade instruction set";
@ -15365,7 +15365,7 @@ let
url = "mirror://cpan/authors/id/A/AA/AAR/Net-LDAP-Server-0.43.tar.gz"; url = "mirror://cpan/authors/id/A/AA/AAR/Net-LDAP-Server-0.43.tar.gz";
sha256 = "0qmh3cri3fpccmwz6bhwp78yskrb3qmalzvqn0a23hqbsfs4qv6x"; sha256 = "0qmh3cri3fpccmwz6bhwp78yskrb3qmalzvqn0a23hqbsfs4qv6x";
}; };
propagatedBuildInputs = [ NetLDAP ConvertASN1 ]; propagatedBuildInputs = [ perlldap ConvertASN1 ];
meta = { meta = {
description = "LDAP server side protocol handling"; description = "LDAP server side protocol handling";
license = with lib.licenses; [ artistic1 ]; license = with lib.licenses; [ artistic1 ];
@ -15392,7 +15392,7 @@ let
url = "mirror://cpan/authors/id/K/KA/KARMAN/Net-LDAP-Server-Test-0.22.tar.gz"; url = "mirror://cpan/authors/id/K/KA/KARMAN/Net-LDAP-Server-Test-0.22.tar.gz";
sha256 = "13idip7jky92v4adw60jn2gcc3zf339gsdqlnc9nnvqzbxxp285i"; sha256 = "13idip7jky92v4adw60jn2gcc3zf339gsdqlnc9nnvqzbxxp285i";
}; };
propagatedBuildInputs = [ NetLDAP NetLDAPServer TestMore DataDump NetLDAPSID ]; propagatedBuildInputs = [ perlldap NetLDAPServer DataDump NetLDAPSID ];
meta = { meta = {
description= "test Net::LDAP code"; description= "test Net::LDAP code";
license = with lib.licenses; [ artistic1 ]; license = with lib.licenses; [ artistic1 ];
@ -23070,7 +23070,7 @@ let
sha256 = "582db53a091f8da3670c037733314f2510af5e8ee0ba42a0e391e2f2e3ca7734"; sha256 = "582db53a091f8da3670c037733314f2510af5e8ee0ba42a0e391e2f2e3ca7734";
}; };
prePatch = "rm examples.pl"; prePatch = "rm examples.pl";
propagatedBuildInputs = [ LWPProtocolhttps ]; propagatedBuildInputs = [ LWPProtocolHttps ];
meta = { meta = {
description = "Accessing Twilio's REST API with Perl"; description = "Accessing Twilio's REST API with Perl";
license = with lib.licenses; [ artistic1 gpl1Plus ]; license = with lib.licenses; [ artistic1 gpl1Plus ];

View File

@ -7326,7 +7326,7 @@ in {
salmon-mail = callPackage ../development/python-modules/salmon-mail { }; salmon-mail = callPackage ../development/python-modules/salmon-mail { };
sane = callPackage ../development/python-modules/sane { sane = callPackage ../development/python-modules/sane {
inherit (pkgs) saneBackends; inherit (pkgs) sane-backends;
}; };
sampledata = callPackage ../development/python-modules/sampledata { }; sampledata = callPackage ../development/python-modules/sampledata { };