mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-19 00:08:32 +01:00
Merge branch 'staging-next'
This commit is contained in:
Vladimír Čunát
commit
d00918ccaf
242 changed files with 1978 additions and 2011 deletions
|
|
@ -244,19 +244,27 @@ def main() -> None:
|
|||
subprocess.check_call(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@"] + flags + ["install"])
|
||||
else:
|
||||
# Update bootloader to latest if needed
|
||||
systemd_version = subprocess.check_output(["@systemd@/bin/bootctl", "--version"], universal_newlines=True).split()[1]
|
||||
systemd_version = subprocess.check_output(["@systemd@/bin/bootctl", "--version"], universal_newlines=True).split()[2]
|
||||
sdboot_status = subprocess.check_output(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "status"], universal_newlines=True)
|
||||
|
||||
# See status_binaries() in systemd bootctl.c for code which generates this
|
||||
m = re.search("^\W+File:.*/EFI/(BOOT|systemd)/.*\.efi \(systemd-boot (\d+)\)$",
|
||||
m = re.search("^\W+File:.*/EFI/(BOOT|systemd)/.*\.efi \(systemd-boot ([\d.]+[^)]*)\)$",
|
||||
sdboot_status, re.IGNORECASE | re.MULTILINE)
|
||||
|
||||
needs_install = False
|
||||
|
||||
if m is None:
|
||||
print("could not find any previously installed systemd-boot")
|
||||
print("could not find any previously installed systemd-boot, installing.")
|
||||
# Let systemd-boot attempt an installation if a previous one wasn't found
|
||||
needs_install = True
|
||||
else:
|
||||
sdboot_version = m.group(2)
|
||||
if systemd_version > sdboot_version:
|
||||
sdboot_version = f'({m.group(2)})'
|
||||
if systemd_version != sdboot_version:
|
||||
print("updating systemd-boot from %s to %s" % (sdboot_version, systemd_version))
|
||||
subprocess.check_call(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "update"])
|
||||
needs_install = True
|
||||
|
||||
if needs_install:
|
||||
subprocess.check_call(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "update"])
|
||||
|
||||
mkdir_p("@efiSysMountPoint@/efi/nixos")
|
||||
mkdir_p("@efiSysMountPoint@/loader/entries")
|
||||
|
|
|
|||
|
|
@ -102,12 +102,12 @@ in
|
|||
machine.succeed(
|
||||
"""
|
||||
find /boot -iname '*.efi' -print0 | \
|
||||
xargs -0 -I '{}' sed -i 's/#### LoaderInfo: systemd-boot .* ####/#### LoaderInfo: systemd-boot 001 ####/' '{}'
|
||||
xargs -0 -I '{}' sed -i 's/#### LoaderInfo: systemd-boot .* ####/#### LoaderInfo: systemd-boot 000.0-1-notnixos ####/' '{}'
|
||||
"""
|
||||
)
|
||||
|
||||
output = machine.succeed("/run/current-system/bin/switch-to-configuration boot")
|
||||
assert "updating systemd-boot from 001 to " in output
|
||||
assert "updating systemd-boot from (000.0-1-notnixos) to " in output
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
, cmake
|
||||
, curl
|
||||
, dbus
|
||||
, epoxy
|
||||
, libepoxy
|
||||
, fetchFromGitHub
|
||||
, freeglut
|
||||
, freetype
|
||||
|
|
@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
|
|||
brotli
|
||||
curl
|
||||
dbus
|
||||
epoxy
|
||||
libepoxy
|
||||
freeglut
|
||||
freetype
|
||||
gtk2-x11
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
, linuxHeaders
|
||||
, at-spi2-core
|
||||
, dbus
|
||||
, epoxy
|
||||
, libepoxy
|
||||
, libXdmcp
|
||||
, libXtst
|
||||
, libpthreadstubs
|
||||
|
|
@ -143,7 +143,7 @@ stdenv.mkDerivation rec {
|
|||
] ++ optionals stdenv.isLinux [
|
||||
at-spi2-core
|
||||
dbus
|
||||
epoxy
|
||||
libepoxy
|
||||
libXdmcp
|
||||
libXtst
|
||||
libpthreadstubs
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, fetchFromGitHub, pkg-config, cmake
|
||||
{ stdenv, lib, fetchFromGitHub, buildPackages, pkg-config, cmake
|
||||
, alsa-lib, glib, libjack2, libsndfile, libpulseaudio
|
||||
, AudioUnit, CoreAudio, CoreMIDI, CoreServices
|
||||
}:
|
||||
|
|
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0x5808d03ym23np17nl8gfbkx3c4y3d7jyyr2222wn2prswbb6x3";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config cmake ];
|
||||
nativeBuildInputs = [ buildPackages.stdenv.cc pkg-config cmake ];
|
||||
|
||||
buildInputs = [ glib libsndfile libpulseaudio libjack2 ]
|
||||
++ lib.optionals stdenv.isLinux [ alsa-lib ]
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
, libpthreadstubs
|
||||
, libXdmcp
|
||||
, libxkbcommon
|
||||
, epoxy
|
||||
, libepoxy
|
||||
, at-spi2-core
|
||||
, dbus
|
||||
, curl
|
||||
|
|
@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
|
|||
libpthreadstubs
|
||||
libXdmcp
|
||||
libxkbcommon
|
||||
epoxy
|
||||
libepoxy
|
||||
at-spi2-core
|
||||
dbus
|
||||
curl
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ config, lib, stdenv, fetchurl, zlib, pkg-config, mpg123, libogg, libvorbis, portaudio, libsndfile, flac
|
||||
{ config, lib, stdenv, fetchurl, fetchpatch, zlib, pkg-config, mpg123, libogg, libvorbis, portaudio, libsndfile, flac
|
||||
, usePulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -12,6 +12,16 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1c54lldr2imjzhlhq5lvwhj7d5794xm97cby9pznr5wdjjay0sa4";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix pending upstream inclusion for gcc-12 include headers:
|
||||
# https://github.com/OpenMPT/openmpt/pull/8
|
||||
(fetchpatch {
|
||||
name = "gcc-12.patch";
|
||||
url = "https://github.com/OpenMPT/openmpt/commit/6e7a43190ef2f9ba0b3efc19b9527261b69ec8f7.patch";
|
||||
sha256 = "081m1rf09bbrlg52aihaajmld5dcnwbp6y7zpyik92mm332r330h";
|
||||
})
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
, linuxHeaders
|
||||
, at-spi2-core
|
||||
, dbus
|
||||
, epoxy
|
||||
, libepoxy
|
||||
, libXdmcp
|
||||
, libXtst
|
||||
, libpthreadstubs
|
||||
|
|
@ -128,7 +128,7 @@ stdenv.mkDerivation rec {
|
|||
] ++ lib.optionals stdenv.isLinux [
|
||||
at-spi2-core
|
||||
dbus
|
||||
epoxy
|
||||
libepoxy
|
||||
libXdmcp
|
||||
libXtst
|
||||
libpthreadstubs
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
, cmake
|
||||
, curl
|
||||
, dconf
|
||||
, epoxy
|
||||
, libepoxy
|
||||
, ffmpeg
|
||||
, fftw
|
||||
, fftwFloat
|
||||
|
|
@ -94,7 +94,7 @@ stdenv.mkDerivation rec {
|
|||
chromaprint
|
||||
curl
|
||||
dconf
|
||||
epoxy
|
||||
libepoxy
|
||||
ffmpeg
|
||||
fftw
|
||||
fftwFloat
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, fetchgit, pkg-config, linkFarm, lightdm-enso-os-greeter
|
||||
, dbus, pcre, epoxy, libXdmcp, at-spi2-core, libxklavier, libxkbcommon, libpthreadstubs
|
||||
, dbus, pcre, libepoxy, libXdmcp, at-spi2-core, libxklavier, libxkbcommon, libpthreadstubs
|
||||
, gtk3, vala, cmake, libgee, libX11, lightdm, gdk-pixbuf, clutter-gtk, wrapGAppsHook, librsvg }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
|
@ -27,7 +27,7 @@ stdenv.mkDerivation {
|
|||
dbus
|
||||
gtk3
|
||||
pcre
|
||||
epoxy
|
||||
libepoxy
|
||||
libgee
|
||||
libX11
|
||||
lightdm
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, fetchgit, dconf, gtksourceview3, at-spi2-core, gtksourceviewmm,
|
||||
boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkg-config, pcre,
|
||||
boost, libepoxy, cmake, aspell, llvmPackages, libgit2, pkg-config, pcre,
|
||||
libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts, gtkmm3,
|
||||
coreutils, glibc, dbus, openssl, libxml2, gnumake, ctags }:
|
||||
|
||||
|
|
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
|||
gtksourceview3
|
||||
at-spi2-core
|
||||
pcre
|
||||
epoxy
|
||||
libepoxy
|
||||
boost
|
||||
libXdmcp
|
||||
cmake
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
, curl
|
||||
, sane-backends
|
||||
, libXpm
|
||||
, epoxy
|
||||
, libepoxy
|
||||
, poppler
|
||||
, mesa
|
||||
, lirc
|
||||
|
|
@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
|
|||
sane-backends
|
||||
libdrm
|
||||
libXpm
|
||||
epoxy
|
||||
libepoxy
|
||||
poppler
|
||||
lirc
|
||||
mesa
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
, ninja
|
||||
, pkg-config
|
||||
, wrapGAppsHook
|
||||
, epoxy
|
||||
, libepoxy
|
||||
, gtk4
|
||||
, zbar
|
||||
, tiffSupport ? true
|
||||
|
|
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
epoxy
|
||||
libepoxy
|
||||
gtk4
|
||||
zbar
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, pcre, libxkbcommon, epoxy
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, pcre, libxkbcommon, libepoxy
|
||||
, gtk3, poppler, freetype, libpthreadstubs, libXdmcp, libxshmfence, wrapGAppsHook
|
||||
}:
|
||||
|
||||
|
|
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
poppler pcre libxkbcommon epoxy
|
||||
poppler pcre libxkbcommon libepoxy
|
||||
freetype gtk3
|
||||
libpthreadstubs libXdmcp libxshmfence # otherwise warnings in compilation
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
{ lib, stdenv, fetchurl, cmake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "soxr-0.1.3";
|
||||
pname = "soxr";
|
||||
version = "0.1.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/soxr/${name}-Source.tar.xz";
|
||||
url = "mirror://sourceforge/soxr/soxr-${version}-Source.tar.xz";
|
||||
sha256 = "12aql6svkplxq5fjycar18863hcq84c5kx8g6f4rj0lcvigw24di";
|
||||
};
|
||||
|
||||
|
|
@ -15,18 +16,20 @@ stdenv.mkDerivation rec {
|
|||
|
||||
outputs = [ "out" "doc" ]; # headers are just two and very small
|
||||
|
||||
preConfigure = if stdenv.isDarwin then ''
|
||||
export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}"`pwd`/build/src
|
||||
'' else ''
|
||||
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}"`pwd`/build/src
|
||||
'';
|
||||
preConfigure =
|
||||
if stdenv.isDarwin then ''
|
||||
export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}"`pwd`/build/src
|
||||
'' else ''
|
||||
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}"`pwd`/build/src
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "An audio resampling library";
|
||||
homepage = "http://soxr.sourceforge.net";
|
||||
license = lib.licenses.lgpl21Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,9 +4,9 @@
|
|||
, curl, writeShellScript, common-updater-scripts }:
|
||||
|
||||
let
|
||||
url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.6.2-328c666b/Hubstaff-1.6.2-328c666b.sh";
|
||||
version = "1.6.2-328c666b";
|
||||
sha256 = "0fmlblw19qk9s9xsl0dl705cnns825wrlc7navii4bvbsn6ycl5v";
|
||||
url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.6.3-b75e2da6/Hubstaff-1.6.3-b75e2da6.sh";
|
||||
version = "1.6.3-b75e2da6";
|
||||
sha256 = "0p77182p5rqbng8j6ndijq5br9hiwcmblpw8j5nc26m5w45jfspw";
|
||||
|
||||
rpath = lib.makeLibraryPath
|
||||
[ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ in buildFHSUserEnv {
|
|||
nasm sndio
|
||||
|
||||
# Snes9x
|
||||
epoxy minizip
|
||||
libepoxy minizip
|
||||
|
||||
# Vice
|
||||
bison flex
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
, proj
|
||||
, cairo
|
||||
, libxkbcommon
|
||||
, epoxy
|
||||
, libepoxy
|
||||
, wrapGAppsHook
|
||||
, at-spi2-core
|
||||
, dbus
|
||||
|
|
@ -126,7 +126,7 @@ in stdenv.mkDerivation rec {
|
|||
libpthreadstubs
|
||||
libXdmcp
|
||||
libxkbcommon
|
||||
epoxy
|
||||
libepoxy
|
||||
at-spi2-core
|
||||
dbus
|
||||
];
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
, libva
|
||||
, libdrm, wayland, libxkbcommon # Ozone
|
||||
, curl
|
||||
, epoxy
|
||||
, libepoxy
|
||||
# postPatch:
|
||||
, glibc # gconv + locale
|
||||
|
||||
|
|
@ -150,7 +150,7 @@ let
|
|||
libva
|
||||
libdrm wayland mesa.drivers libxkbcommon
|
||||
curl
|
||||
epoxy
|
||||
libepoxy
|
||||
] ++ optionals gnomeSupport [ gnome2.GConf libgcrypt ]
|
||||
++ optional gnomeKeyringSupport libgnome-keyring3
|
||||
++ optionals cupsSupport [ libgcrypt cups ]
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
, libnotify, libsoup, libgee
|
||||
, librsvg, libsignal-protocol-c
|
||||
, libgcrypt
|
||||
, epoxy
|
||||
, libepoxy
|
||||
, at-spi2-core
|
||||
, sqlite
|
||||
, dbus
|
||||
|
|
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
|
|||
libgcrypt
|
||||
libsoup
|
||||
pcre
|
||||
epoxy
|
||||
libepoxy
|
||||
at-spi2-core
|
||||
dbus
|
||||
icu
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
, ffmpeg, openalSoft, minizip, libopus, alsa-lib, libpulseaudio, range-v3
|
||||
, tl-expected, hunspell, glibmm, webkitgtk
|
||||
# Transitive dependencies:
|
||||
, pcre, xorg, util-linux, libselinux, libsepol, epoxy
|
||||
, pcre, xorg, util-linux, libselinux, libsepol, libepoxy
|
||||
, at-spi2-core, libXtst, libthai, libdatrie
|
||||
}:
|
||||
|
||||
|
|
@ -41,7 +41,7 @@ in mkDerivation rec {
|
|||
tl-expected hunspell glibmm webkitgtk
|
||||
tg_owt
|
||||
# Transitive dependencies:
|
||||
pcre xorg.libXdmcp util-linux libselinux libsepol epoxy
|
||||
pcre xorg.libXdmcp util-linux libselinux libsepol libepoxy
|
||||
at-spi2-core libXtst libthai libdatrie
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@
|
|||
, libXdmcp
|
||||
, libselinux
|
||||
, libsepol
|
||||
, epoxy
|
||||
, libepoxy
|
||||
, at-spi2-core
|
||||
, libXtst
|
||||
, libthai
|
||||
|
|
@ -135,7 +135,7 @@ mkDerivation rec {
|
|||
libXdmcp
|
||||
libselinux
|
||||
libsepol
|
||||
epoxy
|
||||
libepoxy
|
||||
at-spi2-core
|
||||
libXtst
|
||||
libthai
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
, libX11
|
||||
, gst_all_1
|
||||
, sqlite
|
||||
, epoxy
|
||||
, libepoxy
|
||||
, pango
|
||||
, cairo
|
||||
, gdk-pixbuf
|
||||
|
|
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
|
|||
pcsclite
|
||||
gtk3
|
||||
cairo
|
||||
epoxy
|
||||
libepoxy
|
||||
pango
|
||||
gdk-pixbuf
|
||||
gst_all_1.gstreamer
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
, freerdp, libssh, libgcrypt, gnutls
|
||||
, pcre2, libdbusmenu-gtk3, libappindicator-gtk3
|
||||
, libvncserver, libpthreadstubs, libXdmcp, libxkbcommon
|
||||
, libsecret, libsoup, spice-protocol, spice-gtk, epoxy, at-spi2-core
|
||||
, libsecret, libsoup, spice-protocol, spice-gtk, libepoxy, at-spi2-core
|
||||
, openssl, gsettings-desktop-schemas, json-glib, libsodium, webkitgtk, harfbuzz
|
||||
# The themes here are soft dependencies; only icons are missing without them.
|
||||
, gnome
|
||||
|
|
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
|||
freerdp libssh libgcrypt gnutls
|
||||
pcre2 libdbusmenu-gtk3 libappindicator-gtk3
|
||||
libvncserver libpthreadstubs libXdmcp libxkbcommon
|
||||
libsecret libsoup spice-protocol spice-gtk epoxy at-spi2-core
|
||||
libsecret libsoup spice-protocol spice-gtk libepoxy at-spi2-core
|
||||
openssl gnome.adwaita-icon-theme json-glib libsodium webkitgtk
|
||||
harfbuzz
|
||||
];
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
, libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf
|
||||
, librevenge, libe-book, libmwaw, glm, gst_all_1
|
||||
, gdb, commonsLogging, librdf_rasqal, wrapGAppsHook
|
||||
, gnome, glib, ncurses, epoxy, gpgme
|
||||
, gnome, glib, ncurses, libepoxy, gpgme
|
||||
, langs ? [ "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sl" "zh-CN" ]
|
||||
, withHelp ? true
|
||||
, kdeIntegration ? false, mkDerivation ? null, qtbase ? null, qtx11extras ? null
|
||||
|
|
@ -396,7 +396,7 @@ in (mkDrv rec {
|
|||
python3 sane-backends unzip which zip zlib
|
||||
mdds bluez5 libwps libabw libzmf
|
||||
libxshmfence libatomic_ops graphite2 harfbuzz gpgme util-linux
|
||||
librevenge libe-book libmwaw glm ncurses epoxy
|
||||
librevenge libe-book libmwaw glm ncurses libepoxy
|
||||
libodfgen CoinMP librdf_rasqal gnome.adwaita-icon-theme gettext
|
||||
]
|
||||
++ (with gst_all_1; [
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
, coreutils
|
||||
, cppzmq
|
||||
, curl
|
||||
, epoxy
|
||||
, libepoxy
|
||||
, fetchFromGitHub
|
||||
, glm
|
||||
, gtkmm3
|
||||
|
|
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [
|
||||
cppzmq
|
||||
curl
|
||||
epoxy
|
||||
libepoxy
|
||||
glm
|
||||
gtkmm3
|
||||
libgit2
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
, libthai
|
||||
, libdatrie
|
||||
, libxkbcommon
|
||||
, epoxy
|
||||
, libepoxy
|
||||
, dbus
|
||||
, at-spi2-core
|
||||
, libXtst
|
||||
|
|
@ -131,7 +131,7 @@ stdenv.mkDerivation rec {
|
|||
libthai
|
||||
libdatrie
|
||||
libxkbcommon
|
||||
epoxy
|
||||
libepoxy
|
||||
dbus.daemon
|
||||
at-spi2-core
|
||||
libXtst
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ at-spi2-core, cmake, dbus, dbus-glib, docbook_xsl, epoxy, fetchFromGitHub
|
||||
{ at-spi2-core, cmake, dbus, dbus-glib, docbook_xsl, libepoxy, fetchFromGitHub
|
||||
, glib, gtk3, harfbuzz, libXdmcp, libXtst, libpthreadstubs
|
||||
, libselinux, libsepol, libtasn1, libxkbcommon, libxslt, p11-kit, pcre2
|
||||
, pkg-config, lib, stdenv, util-linuxMinimal, vte, wrapGAppsHook, xmlto
|
||||
|
|
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
|||
buildInputs =
|
||||
[ gtk3 dbus dbus-glib vte pcre2 harfbuzz libpthreadstubs libXdmcp
|
||||
util-linuxMinimal glib docbook_xsl xmlto libselinux
|
||||
libsepol libxkbcommon epoxy at-spi2-core libXtst libtasn1 p11-kit
|
||||
libsepol libxkbcommon libepoxy at-spi2-core libXtst libtasn1 p11-kit
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ fetchurl, lib, stdenv, buildPackages
|
||||
, curl, openssl, zlib, expat, perlPackages, python3, gettext, cpio
|
||||
, gnugrep, gnused, gawk, coreutils # needed at runtime by git-filter-branch etc
|
||||
, openssh, pcre2
|
||||
, openssh, pcre2, bash
|
||||
, asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45
|
||||
, libxslt, tcl, tk, makeWrapper, libiconv
|
||||
, svnSupport, subversionClient, perlLibs, smtpPerlLibs
|
||||
|
|
@ -73,7 +73,7 @@ stdenv.mkDerivation {
|
|||
nativeBuildInputs = [ gettext perlPackages.perl makeWrapper ]
|
||||
++ lib.optionals withManual [ asciidoc texinfo xmlto docbook2x
|
||||
docbook_xsl docbook_xml_dtd_45 libxslt ];
|
||||
buildInputs = [curl openssl zlib expat cpio libiconv]
|
||||
buildInputs = [ curl openssl zlib expat cpio libiconv bash ]
|
||||
++ lib.optionals perlSupport [ perlPackages.perl ]
|
||||
++ lib.optionals guiSupport [tcl tk]
|
||||
++ lib.optionals withpcre2 [ pcre2 ]
|
||||
|
|
@ -84,11 +84,12 @@ stdenv.mkDerivation {
|
|||
NIX_LDFLAGS = lib.optionalString (stdenv.cc.isGNU && stdenv.hostPlatform.libc == "glibc") "-lgcc_s"
|
||||
+ lib.optionalString (stdenv.isFreeBSD) "-lthr";
|
||||
|
||||
configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
|
||||
configureFlags = [
|
||||
"ac_cv_prog_CURL_CONFIG=${lib.getDev curl}/bin/curl-config"
|
||||
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
|
||||
"ac_cv_fread_reads_directories=yes"
|
||||
"ac_cv_snprintf_returns_bogus=no"
|
||||
"ac_cv_iconv_omits_bom=no"
|
||||
"ac_cv_prog_CURL_CONFIG=${curl.dev}/bin/curl-config"
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
|
|
@ -97,8 +98,10 @@ stdenv.mkDerivation {
|
|||
|
||||
makeFlags = [
|
||||
"prefix=\${out}"
|
||||
"SHELL_PATH=${stdenv.shell}"
|
||||
]
|
||||
# Git does not allow setting a shell separately for building and run-time.
|
||||
# Therefore lets leave it at the default /bin/sh when cross-compiling
|
||||
++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) "SHELL_PATH=${stdenv.shell}"
|
||||
++ (if perlSupport then ["PERL_PATH=${perlPackages.perl}/bin/perl"] else ["NO_PERL=1"])
|
||||
++ (if pythonSupport then ["PYTHON_PATH=${python3}/bin/python"] else ["NO_PYTHON=1"])
|
||||
++ lib.optionals stdenv.isSunOS ["INSTALL=install" "NO_INET_NTOP=" "NO_INET_PTON="]
|
||||
|
|
@ -115,6 +118,10 @@ stdenv.mkDerivation {
|
|||
# See https://github.com/Homebrew/homebrew-core/commit/dfa3ccf1e7d3901e371b5140b935839ba9d8b706
|
||||
++ lib.optional stdenv.isDarwin "TKFRAMEWORK=/nonexistent";
|
||||
|
||||
disallowedReferences = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
|
||||
stdenv.shellPackage
|
||||
];
|
||||
|
||||
|
||||
postBuild = ''
|
||||
make -C contrib/subtree
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
, fetchFromGitHub
|
||||
, appstream-glib
|
||||
, desktop-file-utils
|
||||
, epoxy
|
||||
, libepoxy
|
||||
, gettext
|
||||
, glib
|
||||
, gtk3
|
||||
|
|
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
|
|||
wrapGAppsHook
|
||||
];
|
||||
buildInputs = [
|
||||
epoxy
|
||||
libepoxy
|
||||
glib
|
||||
gtk3
|
||||
mpv
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
, at-spi2-core
|
||||
, dbus
|
||||
, elfutils
|
||||
, epoxy
|
||||
, libepoxy
|
||||
, gexiv2
|
||||
, glib
|
||||
, gobject-introspection
|
||||
|
|
@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [
|
||||
at-spi2-core
|
||||
dbus
|
||||
epoxy
|
||||
libepoxy
|
||||
elfutils
|
||||
gexiv2
|
||||
glib
|
||||
|
|
|
|||
|
|
@ -122,11 +122,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
# Avoid Qt 5.12 problem on Big Sur: https://bugreports.qt.io/browse/QTBUG-87014
|
||||
qtWrapperArgs = lib.optionals stdenv.isDarwin [
|
||||
"--set QT_MAC_WANTS_LAYER 1"
|
||||
];
|
||||
|
||||
postFixup = optionalString withGUI ''
|
||||
wrapQtApp $out/bin/mkvtoolnix-gui
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
, xenSupport ? false, xen
|
||||
, cephSupport ? false, ceph
|
||||
, glusterfsSupport ? false, glusterfs, libuuid
|
||||
, openGLSupport ? sdlSupport, mesa, epoxy, libdrm
|
||||
, openGLSupport ? sdlSupport, mesa, libepoxy, libdrm
|
||||
, virglSupport ? openGLSupport, virglrenderer
|
||||
, libiscsiSupport ? true, libiscsi
|
||||
, smbdSupport ? false, samba
|
||||
|
|
@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
|
|||
++ lib.optionals xenSupport [ xen ]
|
||||
++ lib.optionals cephSupport [ ceph ]
|
||||
++ lib.optionals glusterfsSupport [ glusterfs libuuid ]
|
||||
++ lib.optionals openGLSupport [ mesa epoxy libdrm ]
|
||||
++ lib.optionals openGLSupport [ mesa libepoxy libdrm ]
|
||||
++ lib.optionals virglSupport [ virglrenderer ]
|
||||
++ lib.optionals libiscsiSupport [ libiscsi ]
|
||||
++ lib.optionals smbdSupport [ samba ]
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config makeWrapper meson ninja installShellFiles
|
||||
pkg-config makeWrapper meson ninja installShellFiles perl
|
||||
asciidoc xmlto docbook_xml_dtd_45 docbook_xsl findXMLCatalogs
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ function getRole() {
|
|||
role_post='_FOR_TARGET'
|
||||
;;
|
||||
*)
|
||||
echo "@name@: used as improper sort of dependency" >2
|
||||
echo "@name@: used as improper sort of dependency" >&2
|
||||
return 1
|
||||
;;
|
||||
esac
|
||||
|
|
@ -64,7 +64,7 @@ function getTargetRoleWrapper() {
|
|||
export NIX_@wrapperName@_TARGET_TARGET_@suffixSalt@=1
|
||||
;;
|
||||
*)
|
||||
echo "@name@: used as improper sort of dependency" >2
|
||||
echo "@name@: used as improper sort of dependency" >&2
|
||||
return 1
|
||||
;;
|
||||
esac
|
||||
|
|
|
|||
|
|
@ -21,13 +21,13 @@ mangleVarListGeneric() {
|
|||
local -a role_suffixes=("$@")
|
||||
|
||||
local outputVar="${var}_@suffixSalt@"
|
||||
declare -gx ${outputVar}+=''
|
||||
declare -gx "$outputVar"+=''
|
||||
# For each role we serve, we accumulate the input parameters into our own
|
||||
# cc-wrapper-derivation-specific environment variables.
|
||||
for suffix in "${role_suffixes[@]}"; do
|
||||
local inputVar="${var}${suffix}"
|
||||
if [ -v "$inputVar" ]; then
|
||||
export ${outputVar}+="${!outputVar:+$sep}${!inputVar}"
|
||||
export "${outputVar}+=${!outputVar:+$sep}${!inputVar}"
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
|
@ -42,7 +42,7 @@ mangleVarBool() {
|
|||
local -a role_suffixes=("$@")
|
||||
|
||||
local outputVar="${var}_@suffixSalt@"
|
||||
declare -gxi ${outputVar}+=0
|
||||
declare -gxi "${outputVar}+=0"
|
||||
for suffix in "${role_suffixes[@]}"; do
|
||||
local inputVar="${var}${suffix}"
|
||||
if [ -v "$inputVar" ]; then
|
||||
|
|
@ -131,7 +131,7 @@ expandResponseParams() {
|
|||
}
|
||||
|
||||
checkLinkType() {
|
||||
local arg mode
|
||||
local arg
|
||||
type="dynamic"
|
||||
for arg in "$@"; do
|
||||
if [[ "$arg" = -static ]]; then
|
||||
|
|
@ -146,7 +146,7 @@ checkLinkType() {
|
|||
# When building static-pie executables we cannot have rpath
|
||||
# set. At least glibc requires rpath to be empty
|
||||
filterRpathFlags() {
|
||||
local linkType=$1 ret="" i
|
||||
local linkType=$1 ret i
|
||||
shift
|
||||
|
||||
if [[ "$linkType" == "static-pie" ]]; then
|
||||
|
|
@ -156,11 +156,11 @@ filterRpathFlags() {
|
|||
# also skip its argument
|
||||
shift
|
||||
else
|
||||
ret+="$i "
|
||||
ret+=("$i")
|
||||
fi
|
||||
done
|
||||
else
|
||||
ret=$@
|
||||
ret=("$@")
|
||||
fi
|
||||
echo $ret
|
||||
echo "${ret[@]}"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
let
|
||||
pname = "publicsuffix-list";
|
||||
version = "2019-05-24";
|
||||
version = "2021-09-03";
|
||||
in fetchFromGitHub {
|
||||
name = "${pname}-${version}";
|
||||
owner = "publicsuffix";
|
||||
repo = "list";
|
||||
rev = "a1db0e898956e126de65be1a5e977fbbbbeebe33";
|
||||
sha256 = "092153w2jr7nx28p9wc9k6b5azi9c39ghnqfnfiwfzv1j8jm3znq";
|
||||
rev = "2533d032871e1ef1f410fc0754b848d4587c8021";
|
||||
sha256 = "sha256-Q8uIXM1CMu8dlWcVoL17M1XRGu3kG7Y7jpx0oHQh+2I=";
|
||||
|
||||
postFetch = ''
|
||||
tar xf $downloadedFile --strip=1
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
, arcan
|
||||
, audit
|
||||
, dbus
|
||||
, epoxy
|
||||
, libepoxy
|
||||
, fontutil
|
||||
, libGL
|
||||
, libX11
|
||||
|
|
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
|
|||
arcan
|
||||
audit
|
||||
dbus
|
||||
epoxy
|
||||
libepoxy
|
||||
fontutil
|
||||
libGL
|
||||
libX11
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@
|
|||
, tzdata
|
||||
, udisks2
|
||||
, upower
|
||||
, epoxy
|
||||
, libepoxy
|
||||
, gnome-user-share
|
||||
, gnome-remote-desktop
|
||||
, wrapGAppsHook
|
||||
|
|
@ -105,7 +105,7 @@ stdenv.mkDerivation rec {
|
|||
clutter-gtk
|
||||
colord
|
||||
colord-gtk
|
||||
epoxy
|
||||
libepoxy
|
||||
fontconfig
|
||||
gdk-pixbuf
|
||||
glib
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ fetchurl, lib, stdenv, substituteAll, meson, ninja, pkg-config, gnome, glib, gtk3, gsettings-desktop-schemas
|
||||
, gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412, python3
|
||||
, libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash, gnome-session-ctl }:
|
||||
, libxslt, gettext, makeWrapper, systemd, xorg, libepoxy, gnugrep, bash, gnome-session-ctl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-session";
|
||||
|
|
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
glib gtk3 libICE gnome-desktop json-glib xorg.xtrans gnome.adwaita-icon-theme
|
||||
gnome.gnome-settings-daemon gsettings-desktop-schemas systemd epoxy
|
||||
gnome.gnome-settings-daemon gsettings-desktop-schemas systemd libepoxy
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
, gtk3
|
||||
, harfbuzz
|
||||
, ninja
|
||||
, epoxy
|
||||
, libepoxy
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
|
|||
gdk-pixbuf
|
||||
librsvg
|
||||
webkitgtk_4_1
|
||||
epoxy
|
||||
libepoxy
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base
|
||||
gst_all_1.gst-plugins-good
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, gettext, xtrans, dbus-glib, systemd,
|
||||
libSM, libXtst, gtk3, epoxy, polkit, hicolor-icon-theme, mate,
|
||||
libSM, libXtst, gtk3, libepoxy, polkit, hicolor-icon-theme, mate,
|
||||
wrapGAppsHook, fetchpatch, mateUpdateScript
|
||||
}:
|
||||
|
||||
|
|
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
|||
gtk3
|
||||
mate.mate-desktop
|
||||
hicolor-icon-theme
|
||||
epoxy
|
||||
libepoxy
|
||||
polkit
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
mkDerivation, lib,
|
||||
extra-cmake-modules, kdoctools, fetchpatch,
|
||||
|
||||
epoxy, lcms2, libICE, libSM, libcap, libdrm, libinput, libxkbcommon, mesa,
|
||||
libepoxy, lcms2, libICE, libSM, libcap, libdrm, libinput, libxkbcommon, mesa,
|
||||
pipewire, udev, wayland, xcb-util-cursor, xwayland,
|
||||
|
||||
qtdeclarative, qtmultimedia, qtquickcontrols2, qtscript, qtsensors,
|
||||
|
|
@ -21,7 +21,7 @@ mkDerivation {
|
|||
name = "kwin";
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
|
||||
buildInputs = [
|
||||
epoxy lcms2 libICE libSM libcap libdrm libinput libxkbcommon mesa pipewire
|
||||
libepoxy lcms2 libICE libSM libcap libdrm libinput libxkbcommon mesa pipewire
|
||||
udev wayland xcb-util-cursor xwayland
|
||||
|
||||
qtdeclarative qtmultimedia qtquickcontrols2 qtscript qtsensors
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
mkDerivation, lib,
|
||||
extra-cmake-modules, gettext, kdoctools,
|
||||
cups, epoxy, mesa, pcre, pipewire, wayland, wayland-protocols,
|
||||
cups, libepoxy, mesa, pcre, pipewire, wayland, wayland-protocols,
|
||||
kcoreaddons, knotifications, kwayland, kwidgetsaddons, kwindowsystem,
|
||||
kirigami2, kdeclarative, plasma-framework, plasma-wayland-protocols, kio,
|
||||
qtbase
|
||||
|
|
@ -11,7 +11,7 @@ mkDerivation {
|
|||
name = "xdg-desktop-portal-kde";
|
||||
nativeBuildInputs = [ extra-cmake-modules gettext kdoctools ];
|
||||
buildInputs = [
|
||||
cups epoxy mesa pcre pipewire wayland wayland-protocols
|
||||
cups libepoxy mesa pcre pipewire wayland wayland-protocols
|
||||
|
||||
kio kcoreaddons knotifications kwayland kwidgetsaddons kwindowsystem
|
||||
kirigami2 kdeclarative plasma-framework plasma-wayland-protocols
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, mkXfceDerivation, gobject-introspection, vala, gtk3, libICE, libSM
|
||||
, libstartup_notification, libgtop, epoxy, libxfce4util, xfconf }:
|
||||
, libstartup_notification, libgtop, libepoxy, libxfce4util, xfconf }:
|
||||
|
||||
mkXfceDerivation {
|
||||
category = "xfce";
|
||||
|
|
@ -9,7 +9,7 @@ mkXfceDerivation {
|
|||
sha256 = "sha256-5mwyC3YA1LvdVSvaHN7CXDJh+IXjmdHGLKzhpjtUZkw=";
|
||||
|
||||
nativeBuildInputs = [ gobject-introspection vala ];
|
||||
buildInputs = [ gtk3 libstartup_notification libgtop epoxy xfconf ];
|
||||
buildInputs = [ gtk3 libstartup_notification libgtop libepoxy xfconf ];
|
||||
propagatedBuildInputs = [ libxfce4util libICE libSM ];
|
||||
|
||||
configureFlags = [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ mkXfceDerivation, exo, librsvg, dbus-glib, epoxy, gtk3, libXdamage
|
||||
{ mkXfceDerivation, exo, librsvg, dbus-glib, libepoxy, gtk3, libXdamage
|
||||
, libstartup_notification, libxfce4ui, libxfce4util, libwnck
|
||||
, libXpresent, xfconf }:
|
||||
|
||||
|
|
@ -13,7 +13,7 @@ mkXfceDerivation {
|
|||
|
||||
buildInputs = [
|
||||
dbus-glib
|
||||
epoxy
|
||||
libepoxy
|
||||
gtk3
|
||||
libXdamage
|
||||
libstartup_notification
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
, ncurses
|
||||
, readline
|
||||
, withGui ? false
|
||||
, gtk3 ? null
|
||||
, gtk3
|
||||
, wrapGAppsHook
|
||||
, withTeensyduino ? false
|
||||
/* Packages needed for Teensyduino */
|
||||
|
|
@ -31,7 +31,6 @@
|
|||
, udev
|
||||
}:
|
||||
|
||||
assert withGui -> gtk3 != null && wrapGAppsHook != null;
|
||||
assert withTeensyduino -> withGui;
|
||||
let
|
||||
externalDownloads = import ./downloads.nix {
|
||||
|
|
@ -76,12 +75,12 @@ let
|
|||
else if stdenv.hostPlatform.isAarch32 then "linuxarm"
|
||||
else throw "${stdenv.hostPlatform.system} is not supported in teensy";
|
||||
|
||||
flavor = (if withTeensyduino then "teensyduino" else "arduino")
|
||||
pname = (if withTeensyduino then "teensyduino" else "arduino")
|
||||
+ lib.optionalString (!withGui) "-core";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
inherit pname;
|
||||
version = "1.8.16";
|
||||
name = "${flavor}-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arduino";
|
||||
|
|
@ -103,13 +102,12 @@ stdenv.mkDerivation rec {
|
|||
# Used because teensyduino requires jars be a specific size
|
||||
arduino_dist_src = fetchurl {
|
||||
url = "https://downloads.arduino.cc/arduino-${version}-${teensy_architecture}.tar.xz";
|
||||
sha256 =
|
||||
{
|
||||
linux64 = "sha256-VK+Skl2xjqPWYEEKt1CCLwBZRxoyRfYQ3/60Byen9po=";
|
||||
linux32 = "sha256-fjqV4avddmWAdFqMuUNUcDguxv3SI45m5QHFiWP8EKE=";
|
||||
linuxarm = "sha256-Br8vUN7njI7VCH+ZvUh44l8LcgW+61+Q0x2AiXxIhTM=";
|
||||
linuxaarch64 = "sha256-bOizBUUuyINg0/EqEatBq9lECT97JXxKbesCGyCA3YQ=";
|
||||
}.${teensy_architecture} or (throw "No arduino binaries for ${teensy_architecture}");
|
||||
sha256 = {
|
||||
linux64 = "sha256-VK+Skl2xjqPWYEEKt1CCLwBZRxoyRfYQ3/60Byen9po=";
|
||||
linux32 = "sha256-fjqV4avddmWAdFqMuUNUcDguxv3SI45m5QHFiWP8EKE=";
|
||||
linuxarm = "sha256-Br8vUN7njI7VCH+ZvUh44l8LcgW+61+Q0x2AiXxIhTM=";
|
||||
linuxaarch64 = "sha256-bOizBUUuyINg0/EqEatBq9lECT97JXxKbesCGyCA3YQ=";
|
||||
}.${teensy_architecture} or (throw "No arduino binaries for ${teensy_architecture}");
|
||||
};
|
||||
|
||||
# the glib setup hook will populate GSETTINGS_SCHEMAS_PATH,
|
||||
|
|
@ -157,7 +155,7 @@ stdenv.mkDerivation rec {
|
|||
javaPath = lib.makeBinPath [ jdk ];
|
||||
|
||||
# Everything else will be patched into rpath
|
||||
rpath = (lib.makeLibraryPath [ zlib libusb-compat-0_1 libusb1 readline ncurses5 stdenv.cc.cc ]);
|
||||
rpath = lib.makeLibraryPath [ zlib libusb-compat-0_1 libusb1 readline ncurses5 stdenv.cc.cc ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/arduino
|
||||
|
|
|
|||
|
|
@ -187,11 +187,6 @@ let
|
|||
# Fix linker error on Darwin (see https://trac.macports.org/ticket/61865)
|
||||
NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lobjc";
|
||||
|
||||
# Avoid Qt 5.12 problem on Big Sur: https://bugreports.qt.io/browse/QTBUG-87014
|
||||
qtWrapperArgs = lib.optionals stdenv.isDarwin [
|
||||
"--set QT_MAC_WANTS_LAYER 1"
|
||||
];
|
||||
|
||||
# See https://savannah.gnu.org/bugs/?50339
|
||||
F77_INTEGER_8_FLAG = if use64BitIdx then "-fdefault-integer-8" else "";
|
||||
|
||||
|
|
|
|||
|
|
@ -100,9 +100,22 @@ let
|
|||
|
||||
enableParallelBuilding = !crossCompiling;
|
||||
|
||||
# perl includes the build date, the uname of the build system and the
|
||||
# username of the build user in some files.
|
||||
# We override these to make it build deterministically.
|
||||
# other distro solutions
|
||||
# https://github.com/bmwiedemann/openSUSE/blob/master/packages/p/perl/perl-reproducible.patch
|
||||
# https://github.com/archlinux/svntogit-packages/blob/packages/perl/trunk/config.over
|
||||
# https://salsa.debian.org/perl-team/interpreter/perl/blob/debian-5.26/debian/config.over
|
||||
# A ticket has been opened upstream to possibly clean some of this up: https://rt.perl.org/Public/Bug/Display.html?id=133452
|
||||
preConfigure = ''
|
||||
substituteInPlace ./Configure --replace '`LC_ALL=C; LANGUAGE=C; export LC_ALL; export LANGUAGE; $date 2>&1`' 'Thu Jan 1 00:00:01 UTC 1970'
|
||||
substituteInPlace ./Configure --replace '$uname -a' '$uname --kernel-name --machine --operating-system'
|
||||
cat > config.over <<EOF
|
||||
${lib.optionalString (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isGnu) ''osvers="gnulinux"''}
|
||||
myuname="nixpkgs"
|
||||
myhostname="nixpkgs"
|
||||
cf_by="nixpkgs"
|
||||
cf_time="$(date -d "@$SOURCE_DATE_EPOCH")"
|
||||
EOF
|
||||
'' + optionalString stdenv.isDarwin ''
|
||||
substituteInPlace hints/darwin.sh --replace "env MACOSX_DEPLOYMENT_TARGET=10.3" ""
|
||||
'' + optionalString (!enableThreading) ''
|
||||
|
|
@ -110,6 +123,9 @@ let
|
|||
sed -i 's,\(libswanted.*\)pthread,\1,g' Configure
|
||||
'';
|
||||
|
||||
# Default perl does not support --host= & co.
|
||||
configurePlatforms = [];
|
||||
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
||||
passthru = rec {
|
||||
|
|
|
|||
|
|
@ -21,11 +21,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "spidermonkey";
|
||||
version = "78.11.0";
|
||||
version = "78.15.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz";
|
||||
sha256 = "0zjpzkxx3wc2840d7q4b9lnkj1kwk1qps29s9c83jf5y6xclnf9q";
|
||||
sha256 = "0l91cxdc5v9fps79ckb1kid4gw6v5qng1jd9zvaacwaiv628shx4";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -1,11 +1,23 @@
|
|||
{ lib, stdenv, fetchurl
|
||||
, imake, gccmakedep, bison, flex, pkg-config
|
||||
, xlibsWrapper, libXmu, libXpm, libXp }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, imake
|
||||
, gccmakedep
|
||||
, bison
|
||||
, flex
|
||||
, pkg-config
|
||||
, xlibsWrapper
|
||||
, libXmu
|
||||
, libXpm
|
||||
, libXp
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "Xaw3d";
|
||||
version = "1.6.3";
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "Xaw3d-1.6.3";
|
||||
src = fetchurl {
|
||||
url = "https://www.x.org/releases/individual/lib/libXaw3d-1.6.3.tar.bz2";
|
||||
url = "https://www.x.org/releases/individual/lib/libXaw3d-${version}.tar.bz2";
|
||||
sha256 = "0i653s8g25cc0mimkwid9366bqkbyhdyjhckx7bw77j20hzrkfid";
|
||||
};
|
||||
dontUseImakeConfigure = true;
|
||||
|
|
|
|||
|
|
@ -86,10 +86,6 @@ stdenv.mkDerivation rec {
|
|||
] ++ lib.optional (!x11Support) "--without-x"
|
||||
++ lib.optionals stdenv.isLinux [ "--enable-apparmor" "--enable-libaudit" ];
|
||||
|
||||
# Enable X11 autolaunch support in libdbus. This doesn't actually depend on X11
|
||||
# (it just execs dbus-launch in dbus.tools), contrary to what the configure script demands.
|
||||
# problems building without x11Support so disabled in that case for now
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString x11Support "-DDBUS_ENABLE_X11_AUTOLAUNCH=1";
|
||||
NIX_CFLAGS_LINK = lib.optionalString (!stdenv.isDarwin) "-Wl,--as-needed";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -52,6 +52,10 @@ stdenv.mkDerivation rec {
|
|||
"-Dgtk_doc=${lib.boolToString (!isCross)}" # gtk-doc does do some gobject introspection, which doesn't yet cross-compile.
|
||||
] ++ lib.optional isCross "-Dvapi=false";
|
||||
|
||||
checkInputs = [
|
||||
dbus # for dbus-daemon
|
||||
];
|
||||
|
||||
doCheck = !stdenv.isAarch32 && !stdenv.isAarch64 && !stdenv.isDarwin;
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -16,10 +16,11 @@
|
|||
, libjpeg
|
||||
, libpng
|
||||
, gnome
|
||||
, gobject-introspection
|
||||
, doCheck ? false
|
||||
, makeWrapper
|
||||
, lib
|
||||
, withIntrospection ? (stdenv.buildPlatform == stdenv.hostPlatform)
|
||||
, gobject-introspection
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -43,13 +44,19 @@ stdenv.mkDerivation rec {
|
|||
./installed-tests-path.patch
|
||||
];
|
||||
|
||||
# gdk-pixbuf-thumbnailer is not wrapped therefore strictDeps will work
|
||||
strictDeps = true;
|
||||
|
||||
depsBuildBuild = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
gettext
|
||||
python3
|
||||
gobject-introspection
|
||||
makeWrapper
|
||||
glib
|
||||
gi-docgen
|
||||
|
|
@ -58,7 +65,11 @@ stdenv.mkDerivation rec {
|
|||
libxslt
|
||||
docbook-xsl-nons
|
||||
docbook_xml_dtd_43
|
||||
] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
fixDarwinDylibNames
|
||||
] ++ lib.optionals withIntrospection [
|
||||
gobject-introspection
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
glib
|
||||
|
|
@ -69,7 +80,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
mesonFlags = [
|
||||
"-Dgtk_doc=${lib.boolToString withGtkDoc}"
|
||||
"-Dintrospection=${if (stdenv.buildPlatform == stdenv.hostPlatform) then "enabled" else "disabled"}"
|
||||
"-Dintrospection=${if withIntrospection then "enabled" else "disabled"}"
|
||||
"-Dgio_sniffing=false"
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
, glib
|
||||
, gtk3
|
||||
, graphene
|
||||
, epoxy
|
||||
, libepoxy
|
||||
, json-glib
|
||||
}:
|
||||
|
||||
|
|
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
epoxy
|
||||
libepoxy
|
||||
json-glib
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
, gobject-introspection
|
||||
, fribidi
|
||||
, xorg
|
||||
, epoxy
|
||||
, libepoxy
|
||||
, libxkbcommon
|
||||
, libxml2
|
||||
, gmp
|
||||
|
|
@ -104,7 +104,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
libxkbcommon
|
||||
epoxy
|
||||
libepoxy
|
||||
isocodes
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
AppKit
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
, fribidi
|
||||
, harfbuzz
|
||||
, xorg
|
||||
, epoxy
|
||||
, libepoxy
|
||||
, libxkbcommon
|
||||
, libxml2
|
||||
, gnome
|
||||
|
|
@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
libxkbcommon
|
||||
epoxy
|
||||
libepoxy
|
||||
isocodes
|
||||
] ++ lib.optionals vulkanSupport [
|
||||
vulkan-headers
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, meson, ninja, python3, gtk3, glibmm, cairomm, pangomm, atkmm, epoxy, gnome }:
|
||||
{ lib, stdenv, fetchurl, pkg-config, meson, ninja, python3, gtk3, glibmm, cairomm, pangomm, atkmm, libepoxy, gnome }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gtkmm";
|
||||
|
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
|||
outputs = [ "out" "dev" ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config meson ninja python3 ];
|
||||
buildInputs = [ epoxy ];
|
||||
buildInputs = [ libepoxy ];
|
||||
|
||||
propagatedBuildInputs = [ glibmm gtk3 atkmm cairomm pangomm ];
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
, glibmm_2_68
|
||||
, cairomm_1_16
|
||||
, pangomm_2_48
|
||||
, epoxy
|
||||
, libepoxy
|
||||
, gnome
|
||||
, makeFontsConf
|
||||
, xvfb-run
|
||||
|
|
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
epoxy
|
||||
libepoxy
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "2.8.2";
|
||||
version = "3.0.0";
|
||||
inherit (lib) optional optionals optionalString;
|
||||
mesonFeatureFlag = opt: b:
|
||||
"-D${opt}=${if b then "enabled" else "disabled"}";
|
||||
|
|
@ -39,7 +39,7 @@ stdenv.mkDerivation {
|
|||
owner = "harfbuzz";
|
||||
repo = "harfbuzz";
|
||||
rev = version;
|
||||
sha256 = "sha256-uqcwfe5Oa3S0tyZDzqhIQfRFEv/HaiVWzVvwjqpLo5g=";
|
||||
sha256 = "sha256-yRRr4RcnbwoZ1Hn3+zbbocKFyBSLYx/exaAHNGsPINA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -15,6 +15,12 @@ stdenv.mkDerivation rec {
|
|||
configureFlagsArray+=("CFLAGS=-fno-strict-aliasing -fno-aggressive-loop-optimizations")
|
||||
'';
|
||||
|
||||
# Disable parallel builds as manpages lack some dependencies:
|
||||
# ../tool/jhton ext/JudyHS_funcs_3.htm | grep -v '^[ ]*$' | sed -e 's/\.C//' > man/man3/JudyHS_funcs
|
||||
# make[2]: *** No rule to make target 'man/man3/JSLD', needed by 'all-am'. Stop.
|
||||
# Let's wait for the upstream fix similar to https://sourceforge.net/p/judy/patches/4/
|
||||
enableParallelBuilding = false;
|
||||
|
||||
meta = {
|
||||
homepage = "http://judy.sourceforge.net/";
|
||||
license = lib.licenses.lgpl21Plus;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
mkDerivation, extra-cmake-modules,
|
||||
epoxy, kconfig, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage,
|
||||
libepoxy, kconfig, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage,
|
||||
kwidgetsaddons, kwindowsystem, qtdeclarative
|
||||
}:
|
||||
|
||||
|
|
@ -8,7 +8,7 @@ mkDerivation {
|
|||
name = "kdeclarative";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [
|
||||
epoxy kglobalaccel kguiaddons ki18n kiconthemes kio kwidgetsaddons
|
||||
libepoxy kglobalaccel kguiaddons ki18n kiconthemes kio kwidgetsaddons
|
||||
kwindowsystem
|
||||
];
|
||||
propagatedBuildInputs = [ kconfig kpackage qtdeclarative ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, libcddb, pkg-config, ncurses, help2man, libiconv, Carbon, IOKit }:
|
||||
{ lib, stdenv, fetchurl, fetchpatch, libcddb, pkg-config, ncurses, help2man, libiconv, Carbon, IOKit }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libcdio-2.1.0";
|
||||
|
|
@ -8,6 +8,16 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0avi6apv5ydjy6b9c3z9a46rvp5i57qyr09vr7x4nndxkmcfjl45";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# pull pending upstream patch to fix build on ncurses-6.3:
|
||||
# https://savannah.gnu.org/patch/index.php?10130
|
||||
(fetchpatch {
|
||||
name = "ncurses-6.3.patch";
|
||||
url = "https://savannah.gnu.org/patch/download.php?file_id=52179";
|
||||
sha256 = "1v15gxhpi4bgcr12pb3d9c3hiwj0drvc832vic7sham34lhjmcbb";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, fetchFromGitHub, fixDarwinDylibNames }:
|
||||
{ stdenv, lib, fetchpatch, fetchFromGitHub, fixDarwinDylibNames, pkgsStatic }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libdeflate";
|
||||
|
|
@ -11,10 +11,19 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-P7YbuhP2/zJCpE9dxZev1yy5oda8WKAHY84ZLTL8gVs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/ebiggers/libdeflate/commit/ee4d18872bfe09a32cfd031c716b9069a04a50a0.diff";
|
||||
sha256 = "0d2lllg60zbbbch0w0qrcqijrgski8xlsy5llg3i684d66ci538a";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile --replace /usr/local $out
|
||||
'';
|
||||
|
||||
makeFlags = lib.optional stdenv.hostPlatform.isStatic [ "DISABLE_SHARED=1"];
|
||||
|
||||
nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
|
||||
|
||||
configurePhase = ''
|
||||
|
|
@ -23,11 +32,12 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.tests.static = pkgsStatic.libdeflate;
|
||||
meta = with lib; {
|
||||
description = "Fast DEFLATE/zlib/gzip compressor and decompressor";
|
||||
license = licenses.mit;
|
||||
homepage = "https://github.com/ebiggers/libdeflate";
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ orivej ];
|
||||
maintainers = with maintainers; [ orivej kaction ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libdrm";
|
||||
version = "2.4.107";
|
||||
version = "2.4.108";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "127qf1rzhaf13vdd75a58v5q34617hvangjlfnlkcdh37gqcwm65";
|
||||
sha256 = "186nwf7qnzh805iz8k3djq3pd1m79mgfnjsbw7yn6rskpj699mx1";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "bin" ];
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@
|
|||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "epoxy";
|
||||
pname = "libepoxy";
|
||||
version = "1.5.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anholt";
|
||||
repo = "libepoxy";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0rmg0qlswn250h0arx434jh3hwzsr95lawanpmh1czsfvrcx59l6";
|
||||
};
|
||||
|
|
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
|||
description = "A library for handling OpenGL function pointer management";
|
||||
homepage = "https://github.com/anholt/libepoxy";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.goibhniu ];
|
||||
maintainers = with maintainers; [ goibhniu erictapen ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -5,9 +5,10 @@
|
|||
, ninja
|
||||
, udev
|
||||
, glib
|
||||
, gobject-introspection
|
||||
, gnome
|
||||
, vala
|
||||
, withIntrospection ? (stdenv.buildPlatform == stdenv.hostPlatform)
|
||||
, gobject-introspection
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -21,12 +22,18 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1al6nr492nzbm8ql02xhzwci2kwb1advnkaky3j9636jf08v41hd";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
depsBuildBuild = [ pkg-config ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
gobject-introspection
|
||||
meson
|
||||
ninja
|
||||
vala
|
||||
glib # for glib-mkenums needed during the build
|
||||
] ++ lib.optionals withIntrospection [
|
||||
gobject-introspection
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -37,8 +44,8 @@ stdenv.mkDerivation rec {
|
|||
mesonFlags = [
|
||||
# There's a dependency cycle with umockdev and the tests fail to LD_PRELOAD anyway
|
||||
"-Dtests=disabled"
|
||||
"-Dintrospection=${if withIntrospection then "enabled" else "disabled"}"
|
||||
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
|
||||
"-Dintrospection=disabled"
|
||||
"-Dvapi=disabled"
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -7,8 +7,9 @@
|
|||
, docbook-xsl-ns
|
||||
, glib
|
||||
, gdk-pixbuf
|
||||
, gobject-introspection
|
||||
, gnome
|
||||
, withIntrospection ? (stdenv.buildPlatform == stdenv.hostPlatform)
|
||||
, gobject-introspection
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -27,15 +28,24 @@ stdenv.mkDerivation rec {
|
|||
"-Dtests=false"
|
||||
"-Ddocbook_docs=disabled"
|
||||
"-Dgtk_doc=false"
|
||||
"-Dintrospection=${if withIntrospection then "enabled" else "disabled"}"
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
gobject-introspection
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
libxslt
|
||||
docbook-xsl-ns
|
||||
glib # for glib-mkenums needed during the build
|
||||
] ++ lib.optionals withIntrospection [
|
||||
gobject-introspection
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals withIntrospection [
|
||||
gobject-introspection
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
, shaderc
|
||||
, glslang
|
||||
, lcms2
|
||||
, epoxy
|
||||
, libepoxy
|
||||
, libGL
|
||||
, xorg
|
||||
}:
|
||||
|
|
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
|||
shaderc
|
||||
glslang
|
||||
lcms2
|
||||
epoxy
|
||||
libepoxy
|
||||
libGL
|
||||
xorg.libX11
|
||||
];
|
||||
|
|
|
|||
|
|
@ -21,11 +21,11 @@ let
|
|||
&& !stdenv.isAarch64;
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "libpsl";
|
||||
version = "0.21.0";
|
||||
version = "0.21.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/rockdaboot/${pname}/releases/download/${pname}-${version}/${pname}-${version}.tar.lz";
|
||||
sha256 = "183hadbira0d2zvv8272lspy31dgm9x26z35c61s5axcd5wd9g9i";
|
||||
url = "https://github.com/rockdaboot/libpsl/releases/download/${version}/libpsl-${version}.tar.lz";
|
||||
sha256 = "1a9kp2rj71jb9q030lmp3zhy33rqxscawbfzhp288fxvazapahv4";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -105,6 +105,9 @@ stdenv.mkDerivation rec {
|
|||
# Fix thumbnailer path
|
||||
sed -e "s#@bindir@\(/gdk-pixbuf-thumbnailer\)#${gdk-pixbuf}/bin\1#g" \
|
||||
-i gdk-pixbuf-loader/librsvg.thumbnailer.in
|
||||
|
||||
# 'error: linker `cc` not found' when cross-compiling
|
||||
export RUSTFLAGS="-Clinker=$CC"
|
||||
'';
|
||||
|
||||
# Not generated when cross compiling.
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libsass";
|
||||
version = "3.6.5";
|
||||
version = "3.6.5"; # also check sassc for updates
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sass";
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libuninameslist";
|
||||
version = "20200413";
|
||||
version = "20210917";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fontforge";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0jbg94z00f5vwqyjfrbill6cjvzp1zrki6m3d235jjxyw0hm3wr5";
|
||||
sha256 = "sha256-bwMgNK3DhhWjijush27265Q1UoZOw7T17fKsaR6IV14=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
, pkg-config
|
||||
, ninja
|
||||
, wayland
|
||||
, epoxy
|
||||
, libepoxy
|
||||
, glib
|
||||
, libwpe
|
||||
, libxkbcommon
|
||||
|
|
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
wayland
|
||||
epoxy
|
||||
libepoxy
|
||||
glib
|
||||
libwpe
|
||||
libxkbcommon
|
||||
|
|
|
|||
|
|
@ -129,6 +129,9 @@ self = stdenv.mkDerivation {
|
|||
"-Dgallium-nine=${boolToString enableGalliumNine}" # Direct3D in Wine
|
||||
"-Dosmesa=${boolToString enableOSMesa}" # used by wine
|
||||
"-Dmicrosoft-clc=disabled" # Only relevant on Windows (OpenCL 1.2 API on top of D3D12)
|
||||
|
||||
# To enable non-mesa gbm backends to be found (e.g. Nvidia)
|
||||
"-Dgbm-backends-path=${libglvnd.driverLink}/lib/gbm:${placeholder "out"}/lib/gbm"
|
||||
] ++ optionals stdenv.isLinux [
|
||||
"-Dglvnd=true"
|
||||
] ++ optionals enableOpenCL [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, SDL2, eigen, epoxy, fftw, gtest, pkg-config }:
|
||||
{ lib, stdenv, fetchurl, SDL2, eigen, libepoxy, fftw, gtest, pkg-config }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "movit";
|
||||
|
|
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
GTEST_DIR = "${gtest.src}/googletest";
|
||||
|
||||
propagatedBuildInputs = [ eigen epoxy ];
|
||||
propagatedBuildInputs = [ eigen libepoxy ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ SDL2 fftw gtest ];
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ let
|
|||
# It will rebuild itself using the version of this package (NSS) and if
|
||||
# an update is required do the required changes to the expression.
|
||||
# Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert
|
||||
version = "3.71";
|
||||
version = "3.72";
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/security/nss/releases/NSS_${lib.replaceStrings [ "." ] [ "_" ] version}_RTM/src/${pname}-${version}.tar.gz";
|
||||
sha256 = "0ly2l3dv6z5hlxs72h5x6796ni3x1bq60saavaf42ddgv4ax7b4r";
|
||||
sha256 = "bqYKn/ET5JPqKrJfQep1qfvRCveQPyb3A9rIaAcy0C4=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
|
|
|||
|
|
@ -25,10 +25,15 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [ opencl-headers ];
|
||||
|
||||
configureFlags = [
|
||||
"--enable-custom-vendordir=/run/opengl-driver/etc/OpenCL/vendors"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "OpenCL ICD Loader for ${opencl-headers.name}";
|
||||
homepage = "https://github.com/OCL-dev/ocl-icd";
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ r-burns ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "opencl-headers-${version}";
|
||||
version = "2020.06.16";
|
||||
version = "2021.06.30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "OpenCL-Headers";
|
||||
rev = "v${version}";
|
||||
sha256 = "0viiwhfqccw90r3mr45ab3wyhabpdrihplj5842brn5ny0ayh73z";
|
||||
sha256 = "sha256-MdKC48f1zhVAcHrqzrgT9iaYrHXurV8vDt+GnDroO9s=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@
|
|||
, harfbuzz
|
||||
, libintl
|
||||
, libthai
|
||||
, gobject-introspection
|
||||
, darwin
|
||||
, fribidi
|
||||
, gnome
|
||||
|
|
@ -16,12 +15,13 @@
|
|||
, meson
|
||||
, ninja
|
||||
, glib
|
||||
, python3
|
||||
, x11Support? !stdenv.isDarwin, libXft
|
||||
, withIntrospection ? (stdenv.buildPlatform == stdenv.hostPlatform)
|
||||
, gobject-introspection
|
||||
, withDocs ? (stdenv.buildPlatform == stdenv.hostPlatform)
|
||||
}:
|
||||
|
||||
let
|
||||
withDocs = stdenv.buildPlatform == stdenv.hostPlatform;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pango";
|
||||
version = "1.48.10";
|
||||
|
|
@ -34,12 +34,21 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "IeH1eYvN/adeq8QoBRSwiWq1b2VtTn5mAwuaJTXs3Jg=";
|
||||
};
|
||||
|
||||
strictDeps = !withIntrospection;
|
||||
|
||||
depsBuildBuild = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson ninja
|
||||
glib # for glib-mkenum
|
||||
pkg-config
|
||||
] ++ lib.optionals withIntrospection [
|
||||
gobject-introspection
|
||||
] ++ lib.optionals withDocs [
|
||||
gi-docgen
|
||||
python3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -63,10 +72,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
mesonFlags = [
|
||||
"-Dgtk_doc=${lib.boolToString withDocs}"
|
||||
"-Dintrospection=${if withIntrospection then "enabled" else "disabled"}"
|
||||
] ++ lib.optionals (!x11Support) [
|
||||
"-Dxft=disabled" # only works with x11
|
||||
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
|
||||
"-Dintrospection=disabled"
|
||||
];
|
||||
|
||||
# Fontconfig error: Cannot load default config file
|
||||
|
|
|
|||
|
|
@ -70,6 +70,17 @@ let
|
|||
# Ensure -I${includedir} is added to Cflags in pkg-config files.
|
||||
# See https://github.com/NixOS/nixpkgs/issues/52457
|
||||
./qtbase.patch.d/0014-qtbase-pkg-config.patch
|
||||
|
||||
# Make Qt applications work on macOS Big Sur even if they're
|
||||
# built with an older version of the macOS SDK (<10.14). This
|
||||
# issue is fixed in 5.12.11, but it requires macOS SDK 10.13 to
|
||||
# build. See https://bugreports.qt.io/browse/QTBUG-87014 for
|
||||
# more info.
|
||||
(fetchpatch {
|
||||
name = "big_sur_layer_backed_views.patch";
|
||||
url = "https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=c5d904639dbd690a36306e2b455610029704d821";
|
||||
sha256 = "0crkw3j1iwdc1pbf5dhar0b4q3h5gs2q1sika8m12y02yk3ns697";
|
||||
})
|
||||
];
|
||||
qtdeclarative = [ ./qtdeclarative.patch ];
|
||||
qtlocation = [ ./qtlocation-gcc-9.patch ];
|
||||
|
|
|
|||
|
|
@ -58,14 +58,7 @@ let
|
|||
qtdeclarative = [ ./qtdeclarative.patch ];
|
||||
qtscript = [ ./qtscript.patch ];
|
||||
qtserialport = [ ./qtserialport.patch ];
|
||||
qtwebengine = [
|
||||
# Fix invisible fonts with glibc 2.33: https://github.com/NixOS/nixpkgs/issues/131074
|
||||
(fetchpatch {
|
||||
url = "https://src.fedoraproject.org/rpms/qt5-qtwebengine/raw/d122c011631137b79455850c363676c655cf9e09/f/qtwebengine-everywhere-src-5.15.5-%231904652.patch";
|
||||
name = "qtwebengine-everywhere-src-5.15.5-_1904652.patch";
|
||||
sha256 = "01q7hagq0ysii1jnrh5adm97vdm9cis592xr6im7accyw6hgcn7b";
|
||||
})
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
qtwebengine = lib.optionals stdenv.isDarwin [
|
||||
./qtwebengine-darwin-no-platform-check.patch
|
||||
./qtwebengine-mac-dont-set-dsymutil-path.patch
|
||||
];
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ lib.mapAttrs mk (lib.importJSON ./srcs-generated.json)
|
|||
|
||||
qtwebengine =
|
||||
let
|
||||
branchName = "5.15.6";
|
||||
branchName = "5.15.7";
|
||||
rev = "v${branchName}-lts";
|
||||
in
|
||||
{
|
||||
|
|
@ -46,7 +46,7 @@ lib.mapAttrs mk (lib.importJSON ./srcs-generated.json)
|
|||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/qt/qtwebengine.git";
|
||||
sha256 = "17bw9yf04zmr9ck5jkrd435c8b03zpf937vn2nwgsr8p78wkg3kr";
|
||||
sha256 = "fssBN/CDgXAuiNj14MPeIDI15ZDRBGuF7wxSXns9exU=";
|
||||
inherit rev branchName;
|
||||
fetchSubmodules = true;
|
||||
leaveDotGit = true;
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, epoxy
|
||||
, libepoxy
|
||||
, glib
|
||||
, gtk3
|
||||
, libpulseaudio
|
||||
|
|
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
epoxy
|
||||
libepoxy
|
||||
glib
|
||||
gtk3
|
||||
libpulseaudio
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
, acl
|
||||
, cyrus_sasl
|
||||
, docbook_xsl
|
||||
, epoxy
|
||||
, libepoxy
|
||||
, gettext
|
||||
, gobject-introspection
|
||||
, gst_all_1
|
||||
|
|
@ -94,7 +94,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
cyrus_sasl
|
||||
epoxy
|
||||
libepoxy
|
||||
gtk3
|
||||
json-glib
|
||||
libcacard
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
{ lib, stdenv, fetchurl, ncurses, libiconv }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "stfl-0.24";
|
||||
pname = "stfl";
|
||||
version = "0.24";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.clifford.at/stfl/${name}.tar.gz";
|
||||
url = "http://www.clifford.at/stfl/stfl-${version}.tar.gz";
|
||||
sha256 = "1460d5lc780p3q38l3wc9jfr2a7zlyrcra0li65aynj738cam9yl";
|
||||
};
|
||||
|
||||
|
|
@ -13,9 +14,9 @@ stdenv.mkDerivation rec {
|
|||
buildPhase = ''
|
||||
sed -i s/gcc/cc/g Makefile
|
||||
sed -i s%ncursesw/ncurses.h%ncurses.h% stfl_internals.h
|
||||
'' + ( lib.optionalString stdenv.isDarwin ''
|
||||
'' + (lib.optionalString stdenv.isDarwin ''
|
||||
sed -i s/-soname/-install_name/ Makefile
|
||||
'' ) + ''
|
||||
'') + ''
|
||||
make
|
||||
'';
|
||||
|
||||
|
|
@ -27,10 +28,10 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "http://www.clifford.at/stfl/";
|
||||
homepage = "http://www.clifford.at/stfl/";
|
||||
description = "A library which implements a curses-based widget set for text terminals";
|
||||
maintainers = with lib.maintainers; [ lovek323 ];
|
||||
license = lib.licenses.lgpl3;
|
||||
platforms = lib.platforms.unix;
|
||||
license = lib.licenses.lgpl3;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,11 +16,12 @@ let
|
|||
# this ^ also fixes CVE-2011-5244
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "t1lib-5.1.2";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "t1lib";
|
||||
version = "5.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://metalab/libs/graphics/t1lib-5.1.2.tar.gz";
|
||||
url = "mirror://metalab/libs/graphics/t1lib-${version}.tar.gz";
|
||||
sha256 = "0nbvjpnmcznib1nlgg8xckrmsw3haa154byds2h90y2g0nsjh4w2";
|
||||
};
|
||||
inherit patches;
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tdb";
|
||||
version = "1.4.3";
|
||||
version = "1.4.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://samba/tdb/${pname}-${version}.tar.gz";
|
||||
sha256 = "06waz0k50c7v3chd08mzp2rv7w4k4q9isbxx3vhlfpx1vy9q61f8";
|
||||
sha256 = "sha256-vPztiE9wMQgJmLXEscXc5XVnBV95QX+G26QNzemaDkE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "tecla-1.6.3";
|
||||
pname = "tecla";
|
||||
version = "1.6.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.astro.caltech.edu/~mcs/tecla/lib${name}.tar.gz";
|
||||
url = "https://www.astro.caltech.edu/~mcs/tecla/libtecla-${version}.tar.gz";
|
||||
sha256 = "06pfq5wa8d25i9bdjkp4xhms5101dsrbg82riz7rz1a0a32pqxgj";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,25 @@
|
|||
{ lib, stdenv, fetchurl, cmake, qtbase, pkg-config, python3Packages, dbus-glib, dbus
|
||||
, telepathy-farstream, telepathy-glib }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, cmake
|
||||
, qtbase
|
||||
, pkg-config
|
||||
, python3Packages
|
||||
, dbus-glib
|
||||
, dbus
|
||||
, telepathy-farstream
|
||||
, telepathy-glib
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (python3Packages) python dbus-python;
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "telepathy-qt-0.9.8";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "telepathy-qt";
|
||||
version = "0.9.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz";
|
||||
url = "https://telepathy.freedesktop.org/releases/telepathy-qt/telepathy-qt-${version}.tar.gz";
|
||||
sha256 = "bf8e2a09060addb80475a4938105b9b41d9e6837999b7a00e5351783857e18ad";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,17 +1,18 @@
|
|||
{ fetchurl, lib, stdenv, tokyocabinet, pkg-config }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "tokyotyrant-1.1.41";
|
||||
pname = "tokyotyrant";
|
||||
version = "1.1.41";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://fallabs.com/tokyotyrant/${name}.tar.gz";
|
||||
url = "https://fallabs.com/tokyotyrant/tokyotyrant-${version}.tar.gz";
|
||||
sha256 = "13xqcinhydqmh7231qlir6pymacjwcf98drybkhd9597kzxp1bs2";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ tokyocabinet ];
|
||||
|
||||
doCheck = false; # FIXME
|
||||
doCheck = false; # FIXME
|
||||
|
||||
meta = {
|
||||
description = "Network interface of the Tokyo Cabinet DBM";
|
||||
|
|
@ -35,7 +36,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
license = lib.licenses.lgpl21Plus;
|
||||
|
||||
platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice
|
||||
platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, gettext
|
||||
, meson
|
||||
, ninja
|
||||
|
|
@ -31,13 +30,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tracker";
|
||||
version = "3.2.0";
|
||||
version = "3.2.1";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-8RelKHXUpNCceqmT+Mio0GRo1dz7FT642qUesThEUTo=";
|
||||
sha256 = "GEfgiznm5h2EhzWqH5f32WwDggFlP6DXy56Bs365wDo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -45,13 +44,6 @@ stdenv.mkDerivation rec {
|
|||
src = ./fix-paths.patch;
|
||||
inherit asciidoc;
|
||||
})
|
||||
] ++ lib.optionals (stdenv.hostPlatform.isi686) [
|
||||
# Upstream: https://gitlab.gnome.org/GNOME/tracker/-/issues/332
|
||||
(fetchpatch {
|
||||
name = "i686-test.patch";
|
||||
url = "https://gitlab.gnome.org/GNOME/tracker/-/commit/af707181a2c492a794daec7ce3f3062d67ffd9dc.patch";
|
||||
sha256 = "sha256-KOdkTy79w3oiQILrPG00UVrv+VBjAk4Y868I8jtifqk=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, libogg }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "tremor-unstable-2018-03-16";
|
||||
pname = "tremor";
|
||||
version = "unstable-2018-03-16";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "xiph";
|
||||
|
|
|
|||
|
|
@ -1,9 +1,11 @@
|
|||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ucl-1.03";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ucl";
|
||||
version = "1.03";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.oberhumer.com/opensource/ucl/download/ucl-1.03.tar.gz";
|
||||
url = "https://www.oberhumer.com/opensource/ucl/download/ucl-${version}.tar.gz";
|
||||
sha256 = "b865299ffd45d73412293369c9754b07637680e5c826915f097577cd27350348";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
{ lib, stdenv, fetchurl, cmake, pkg-config }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "uid_wrapper-1.2.8";
|
||||
pname = "uid_wrapper";
|
||||
version = "1.2.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://samba/cwrap/${name}.tar.gz";
|
||||
url = "mirror://samba/cwrap/uid_wrapper-${version}.tar.gz";
|
||||
sha256 = "0swm9d8l69dw7nbrw6xh7rdy7cfrqflw3hxshicsrhd9v03iwvqf";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib, stdenv, fetchurl, cmake, meson, ninja, pkg-config, python3
|
||||
, libGLU, epoxy, libX11, libdrm, mesa
|
||||
, libGLU, libepoxy, libX11, libdrm, mesa
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1h76a1ylhh4niq33sa5knx033sr4k2816vibh4m58j54y7qc6346";
|
||||
};
|
||||
|
||||
buildInputs = [ libGLU epoxy libX11 libdrm mesa ];
|
||||
buildInputs = [ libGLU libepoxy libX11 libdrm mesa ];
|
||||
|
||||
nativeBuildInputs = [ cmake meson ninja pkg-config python3 ];
|
||||
|
||||
|
|
|
|||
|
|
@ -78,6 +78,7 @@ stdenv.mkDerivation rec {
|
|||
xmlto
|
||||
python3
|
||||
docbook_xml_dtd_45
|
||||
docbook_xsl
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
, enchant2
|
||||
, xorg
|
||||
, libxkbcommon
|
||||
, epoxy
|
||||
, libepoxy
|
||||
, at-spi2-core
|
||||
, libxml2
|
||||
, libsoup
|
||||
|
|
@ -112,7 +112,7 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [
|
||||
at-spi2-core
|
||||
enchant2
|
||||
epoxy
|
||||
libepoxy
|
||||
gnutls
|
||||
gst-plugins-bad
|
||||
gst-plugins-base
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
{ lib, stdenv, fetchurl, darwin }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "webrtc-audio-processing-0.3.1";
|
||||
pname = "webrtc-audio-processing";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://freedesktop.org/software/pulseaudio/webrtc-audio-processing/${name}.tar.xz";
|
||||
url = "https://freedesktop.org/software/pulseaudio/webrtc-audio-processing/webrtc-audio-processing-${version}.tar.xz";
|
||||
sha256 = "1gsx7k77blfy171b6g3m0k0s0072v6jcawhmx1kjs9w5zlwdkzd0";
|
||||
};
|
||||
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue