public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2020-01-11 09:33:08 +01:00
parent 5dfd3c4975 1a654573b0
commit 263bc67bda
388 changed files with 14446 additions and 8556 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/desktops/deepin/dde-control-center/default.nix
View File

@@ -93,6 +93,14 @@ mkDerivation rec {
--replace "/bin/systemctl" "${systemd}/bin/systemctl"
'';
dontWrapQtApps = true;
preFixup = ''
gappsWrapperArgs+=(
"''${qtWrapperArgs[@]}"
)
'';
postFixup = ''
# debuging
searchForUnresolvedDLL $out

10
pkgs/desktops/deepin/dde-dock/default.nix
View File

@@ -31,7 +31,7 @@ unwrapped = mkDerivation rec {
deepin-desktop-schemas
dtkcore
dtkwidget
glib.bin
glib
gsettings-qt
libdbusmenu
polkit
@@ -64,6 +64,14 @@ unwrapped = mkDerivation rec {
cmakeFlags = [ "-DDOCK_TRAY_USE_NATIVE_POPUP=YES" ];
dontWrapQtApps = true;
preFixup = ''
gappsWrapperArgs+=(
"''${qtWrapperArgs[@]}"
)
'';
postFixup = ''
searchHardCodedPaths $out
'';

11
pkgs/desktops/deepin/dde-file-manager/default.nix
View File

@@ -45,8 +45,7 @@ mkDerivation rec {
dtkwidget
ffmpegthumbnailer
file
glib.bin
glib.dev
glib
gnugrep
gsettings-qt
gvfs
@@ -233,6 +232,14 @@ mkDerivation rec {
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libX11}/lib";
'';
dontWrapQtApps = true;
preFixup = ''
gappsWrapperArgs+=(
"''${qtWrapperArgs[@]}"
)
'';
postFixup = ''
# debuging
unset LD_LIBRARY_PATH

11
pkgs/desktops/deepin/dde-launcher/default.nix
View File

@@ -1,7 +1,7 @@
{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, dde-qt-dbus-factory,
dde-session-ui, deepin, deepin-desktop-schemas, deepin-wallpapers,
dtkcore, dtkwidget, gsettings-qt, qtsvg, qttools, qtx11extras,
which, xdg_utils, wrapGAppsHook }:
which, xdg_utils, wrapGAppsHook, glib }:
mkDerivation rec {
pname = "dde-launcher";
@@ -29,6 +29,7 @@ mkDerivation rec {
deepin-wallpapers
dtkcore
dtkwidget
glib
gsettings-qt
qtsvg
qtx11extras
@@ -58,6 +59,14 @@ mkDerivation rec {
# note: `dbus-send` path does not need to be hard coded because it is not used for dtkcore >= 2.0.8.0
'';
dontWrapQtApps = true;
preFixup = ''
gappsWrapperArgs+=(
"''${qtWrapperArgs[@]}"
)
'';
postFixup = ''
# debugging
searchHardCodedPaths $out

12
pkgs/desktops/deepin/dde-session-ui/default.nix
View File

@@ -104,10 +104,18 @@ mkDerivation rec {
# - do not wrap dde-dman-portal related files: it appears it has been removed: https://github.com/linuxdeepin/dde-session-ui/commit/3bd028cf135ad22c784c0146e447ef34a69af768
'';
dontWrapQtApps = true;
preFixup = ''
gappsWrapperArgs+=(
"''${qtWrapperArgs[@]}"
)
'';
postFixup = ''
# wrapGAppsHook does not work with binaries outside of $out/bin or $out/libexec
# wrapGAppsHook or wrapQtAppsHook does not work with binaries outside of $out/bin or $out/libexec
for binary in $out/lib/deepin-daemon/*; do
wrapProgram $binary "''${qtWrapperArgs[@]}"
wrapProgram $binary "''${gappsWrapperArgs[@]}"
done
searchHardCodedPaths $out # debugging

1
pkgs/desktops/deepin/default.nix
View File

@@ -50,6 +50,7 @@ let
qcef = callPackage ./qcef { };
qt5dxcb-plugin = callPackage ./qt5dxcb-plugin { };
qt5integration = callPackage ./qt5integration { };
startdde = callPackage ./startdde { };
udisks2-qt5 = callPackage ./udisks2-qt5 { };
};

136
pkgs/desktops/deepin/startdde/default.nix Normal file
View File

@@ -0,0 +1,136 @@
{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, alsaLib,
coreutils, dbus-factory, dde-api, dde-daemon, dde-dock,
dde-file-manager, dde-polkit-agent, dde-session-ui, deepin,
deepin-desktop-base, deepin-desktop-schemas, deepin-turbo,
dde-kwin, glib, gnome3, go, go-dbus-factory, go-gir-generator,
go-lib, gtk3, jq, kmod, libX11, libXi, libcgroup, pciutils, psmisc,
pulseaudio, systemd, xorg, wrapGAppsHook }:
buildGoPackage rec {
name = "${pname}-${version}";
pname = "startdde";
version = "5.0.1";
goPackagePath = "pkg.deepin.io/dde/startdde";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "1xydmglydksy7hjlavf5pbfy0s0lndgavh8x3kg2mg7d36mbra43";
};
goDeps = ./deps.nix;
outputs = [ "out" ];
nativeBuildInputs = [
pkgconfig
dbus-factory
dde-api
go-dbus-factory
go-gir-generator
go-lib
jq
wrapGAppsHook
deepin.setupHook
];
buildInputs = [
alsaLib
dde-daemon
dde-dock
dde-file-manager
dde-kwin
dde-polkit-agent
dde-session-ui
deepin-desktop-schemas
deepin-turbo
glib
gnome3.dconf
gnome3.gnome-keyring
gnome3.libgnome-keyring
gtk3
kmod
libX11
libXi
libcgroup
pciutils
psmisc
pulseaudio
systemd
xorg.xdriinfo
];
postPatch = ''
searchHardCodedPaths # debugging
# Commented lines below indicates a doubt about how to fix the hard coded path
fixPath $out /etc/X11 Makefile
#fixPath ? /etc/xdg/autostop autostop/autostop.go
fixPath ${coreutils} /bin/ls copyfile_test.go
fixPath $out /usr/share/startdde/auto_launch.json launch_group.go
#fixPath ? /usr/bin/kwin_no_scale main.go # not found on deepin linux and archlinux
fixPath $out /usr/share/startdde/memchecker.json memchecker/config.go
fixPath $out /usr/bin/startdde misc/00deepin-dde-env
fixPath ${dde-file-manager} /usr/bin/dde-file-manager misc/auto_launch/chinese.json
fixPath ${deepin-turbo} /usr/lib/deepin-turbo/booster-dtkwidget misc/auto_launch/chinese.json
fixPath ${dde-daemon} /usr/lib/deepin-daemon/dde-session-daemon misc/auto_launch/chinese.json misc/auto_launch/default.json
fixPath ${dde-dock} /usr/bin/dde-dock misc/auto_launch/chinese.json misc/auto_launch/default.json
fixPath ${dde-file-manager} /usr/bin/dde-desktop misc/auto_launch/chinese.json misc/auto_launch/default.json
fixPath $out /usr/bin/startdde misc/deepin-session
#fixPath ? /usr/lib/lightdm/config-error-dialog.sh misc/deepin-session # provided by lightdm on deepin linux
#fixPath ? /usr/sbin/lightdm-session misc/deepin-session # provided by lightdm on deepin linux
fixPath ${dde-session-ui} /usr/bin/dde-lock session.go
fixPath ${dde-session-ui} /usr/bin/dde-shutdown session.go
fixPath ${dde-session-ui} /usr/lib/deepin-daemon/dde-osd session.go
fixPath ${deepin-desktop-base} /etc/deepin-version session.go
fixPath ${gnome3.gnome-keyring} /usr/bin/gnome-keyring-daemon session.go
fixPath ${pulseaudio} /usr/bin/pulseaudio sound_effect.go
#fixPath ? /usr/lib/UIAppSched.hooks startmanager.go # not found anything about this
fixPath ${dde-session-ui} /usr/lib/deepin-daemon/dde-welcome utils.go
fixPath ${dde-polkit-agent} /usr/lib/polkit-1-dde/dde-polkit-agent watchdog/dde_polkit_agent.go
#fixPath ? /var/log/Xorg.0.log wm/driver.go
#fixPath ? /etc/deepin-wm-switcher/config.json wm/switcher_config.go # not present on nixos, deepin linux and archlinux
substituteInPlace wm/driver.go --replace '/sbin/lsmod' "${kmod}/bin/lsmod"
substituteInPlace session.go --replace 'LookPath("cgexec"' 'LookPath("${libcgroup}/bin/cgexec"'
substituteInPlace vm.go --replace 'Command("dde-wm-chooser"' 'Command("${dde-session-ui}/bin/dde-wm-chooser"'
substituteInPlace vm.go --replace 'Command("systemd-detect-virt"' 'Command("${systemd}/bin/systemd-detect-virt"'
substituteInPlace wm/card_info.go --replace 'Command("lspci"' 'Command("${pciutils}/bin/lspci"'
substituteInPlace wm/driver.go --replace 'Command("lspci"' 'Command("${pciutils}/bin/lspci"'
substituteInPlace wm/driver.go --replace 'Command("xdriinfo"' 'Command("${xorg.xdriinfo}/bin/xdriinfo"'
substituteInPlace wm/platform.go --replace 'Command("gsettings"' 'Command("${glib}/bin/gsettings"'
substituteInPlace wm/platform.go --replace 'Command("uname"' 'Command("${coreutils}/bin/uname"'
substituteInPlace wm/switcher.go --replace 'Command("killall"' 'Command("${psmisc}/bin/killall"'
'';
buildPhase = ''
make -C go/src/${goPackagePath}
'';
installPhase = ''
make install PREFIX="$out" -C go/src/${goPackagePath}
rm -rf $out/share/lightdm # this is uselesss for NixOS
remove-references-to -t ${go} $out/bin/* $out/sbin/*
'';
postFixup = ''
searchHardCodedPaths $out # debugging
'';
passthru = {
updateScript = deepin.updateScript { inherit name; };
providedSessions = [ "deepin" ];
};
meta = with stdenv.lib; {
description = "Starter of deepin desktop environment";
homepage = https://github.com/linuxdeepin/startdde;
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ romildo ];
};
}

30
pkgs/desktops/deepin/startdde/deps.nix generated Normal file
View File

@@ -0,0 +1,30 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
[
{
goPackagePath = "github.com/cryptix/wav";
fetch = {
type = "git";
url = "https://github.com/cryptix/wav";
rev = "8bdace674401f0bd3b63c65479b6a6ff1f9d5e44";
sha256 = "18nyqv0ic35fs9fny8sj84c00vbxs8mnric6vr6yl42624fh5id6";
};
}
{
goPackagePath = "github.com/linuxdeepin/go-x11-client";
fetch = {
type = "git";
url = "https://github.com/linuxdeepin/go-x11-client";
rev = "b5b01565d224d5ccd5a4143d9099acceb23e182a";
sha256 = "1lnffjp8bqy6f8caw6drg1js6hny5w7432riqchcrcd4q85d94rs";
};
}
{
goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "daa7c04131f568e31c51927b359a2d197a357058";
sha256 = "17gbfvb5iqyayzw0zd6q218zsbf7x74rflvn18wkxvsw95n1y54h";
};
}
]

7
pkgs/desktops/gnustep/base/default.nix
View File

@@ -9,6 +9,7 @@
, libobjc, libgcrypt
, icu
, pkgconfig, portaudio
, libiberty
}:
let
version = "1.26.0";
@@ -30,8 +31,14 @@ gsmakeDerivation {
libobjc libgcrypt
icu
portaudio
libiberty
];
patches = [ ./fixup-paths.patch ];
# Bump to gcc9 has give missing xmemdup symbols. Need libiberty here
# to resolve it, unclear why. See #76927 for more info
NIX_LDFLAGS = "-liberty";
meta = {
description = "An implementation of AppKit and Foundation libraries of OPENSTEP and Cocoa";
};

4
pkgs/desktops/mate/engrampa/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "engrampa";
version = "1.22.2";
version = "1.22.3";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0ph7ngk32nnzc3psqjs5zy52zbjilk30spr2r4sixqxvmz7d28gd";
sha256 = "17pn1qgr1a13jxv50qcnzqcw8gr96g7jz2z2y1wbwy7i44bknv6n";
};
nativeBuildInputs = [

12
pkgs/desktops/pantheon/apps/elementary-files/default.nix
View File

@@ -24,13 +24,13 @@
, glib-networking
, elementary-icon-theme
, libcloudproviders
, fetchpatch
, libgit2-glib
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "elementary-files";
version = "4.2.0";
version = "4.3.0";
repoName = "files";
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
sha256 = "12f0hzb62nchksyqd2gwj3cv001rph24ggd9wywh9i1qwppx4b5k";
sha256 = "0brckm0vi9lh8l4g3cy37pbyrdh6g0mdsv3cpii069y2drrh8mz5";
};
passthru = {
@@ -70,6 +70,7 @@ stdenv.mkDerivation rec {
libcloudproviders
libdbusmenu-gtk3
libgee
libgit2-glib
libnotify
libunity
pango
@@ -80,11 +81,6 @@ stdenv.mkDerivation rec {
patches = [
./hardcode-gsettings.patch
# Fixes https://github.com/elementary/files/issues/1081
(fetchpatch {
url = "https://github.com/elementary/files/commit/76b5cc95466733c2c100a99127ecd4fbd4d2a5ec.patch";
sha256 = "0dn8a9l7i2rdgia1rsc50332fsw0yrbfvpb5z8ba4iiki3lxy2nn";
})
];
postPatch = ''

6
pkgs/desktops/pantheon/desktop/gala/default.nix
View File

@@ -26,13 +26,13 @@
stdenv.mkDerivation rec {
pname = "gala";
version = "unstable-2019-10-31"; # Is tracking https://github.com/elementary/gala/commits/stable/juno
version = "3.2.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = "0f0724c97ad49f470f41c4a25c63103f51122997";
sha256 = "09cl3k2am878iiy76bijb0ykrcafh944kz027jgi1y5yk4bwfjc4";
rev = version;
sha256 = "1vf55ls3h20zpf0yxb206cijq8nkf89z2lmhccb4i1g2zajd31ix";
};
passthru = {

2
pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/github_latest_version.ex
View File

@@ -24,7 +24,7 @@ defmodule NixpkgsGitHubUpdate.GitHubLatestVersion do
String.to_charlist("#{System.get_env("OAUTH_TOKEN")}")
end
defp put_token(headers, token) when is_binary(token) do
defp put_token(headers, token) when is_list(token) do
Map.put_new(headers, 'Authorization', 'token #{token}')
end