Merge pull request #58634 from romildo/upd.deepin.new

deepin updates
This commit is contained in:
worldofpeace 2019-04-04 19:48:33 -04:00 committed by GitHub
commit 34c6922966
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
35 changed files with 510 additions and 205 deletions

View file

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
go-dbus-generator
];
makeFlags = [ "GOPATH=$(out)/share/go" ];
makeFlags = [ "GOPATH=${placeholder ''out''}/share/go" ];
postPatch = ''
sed -i -e 's:/share/gocode:/share/go:' Makefile

View file

@ -1,12 +1,32 @@
{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig,
deepin-gettext-tools, go-dbus-factory, go-gir-generator, go-lib,
alsaLib, glib, gtk3, libcanberra, libgudev, librsvg, poppler,
pulseaudio, go, deepin }:
alsaLib,
bc,
blur-effect,
coreutils,
dbus-factory,
deepin,
deepin-gettext-tools,
fontconfig,
glib,
go,
go-dbus-factory,
go-gir-generator,
go-lib,
grub2,
gtk3,
libcanberra,
libgudev,
librsvg,
poppler,
pulseaudio,
rfkill,
xcur2png
}:
buildGoPackage rec {
name = "${pname}-${version}";
pname = "dde-api";
version = "3.5.0";
version = "3.18.1";
goPackagePath = "pkg.deepin.io/dde/api";
@ -14,33 +34,62 @@ buildGoPackage rec {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "1g3s0i5wa6qyv00yksz4r4cy2vhiknq8v0yx7aribvwm3gxf7jw3";
sha256 = "0y8v18f6l3ycysdn4qi7c93z805q7alji8wix4j4qh9x9r35d728";
};
goDeps = ./deps.nix;
outputs = [ "out" ];
nativeBuildInputs = [
pkgconfig
deepin-gettext-tools
go-dbus-factory
go-gir-generator
go-lib
deepin-gettext-tools # build
dbus-factory # build
go-dbus-factory # needed
go-gir-generator # needed
go-lib # build
deepin.setupHook
];
buildInputs = [
alsaLib
glib
gtk3
libcanberra
libgudev
librsvg
poppler
pulseaudio
];
alsaLib # needed
bc # run (to adjust grub theme?)
blur-effect # run (is it really needed?)
coreutils # run (is it really needed?)
fontconfig # run (is it really needed?)
#glib # ? arch
grub2 # run (is it really needed?)
gtk3 # build run
libcanberra # build run
libgudev # needed
librsvg # build run
poppler # build run
pulseaudio # needed
rfkill # run
xcur2png # run
#locales # run (locale-helper needs locale-gen, which is unavailable on NixOS?)
];
postPatch = ''
patchShebangs .
sed -i -e "s|/var|$bin/var|" Makefile
searchHardCodedPaths # debugging
sed -i -e "s|/var|$out/var|" Makefile
# TODO: confirm where to install grub themes
sed -i -e "s|/boot/grub|$out/boot/grub|" Makefile
fixPath $out /usr/lib/deepin-api \
lunar-calendar/main.go \
misc/services/com.deepin.api.CursorHelper.service \
misc/services/com.deepin.api.Graphic.service \
misc/services/com.deepin.api.LunarCalendar.service \
misc/services/com.deepin.api.Pinyin.service \
misc/system-services/com.deepin.api.Device.service \
misc/system-services/com.deepin.api.LocaleHelper.service \
misc/system-services/com.deepin.api.SoundThemePlayer.service \
misc/systemd/system/deepin-shutdown-sound.service \
theme_thumb/gtk/gtk.go \
thumbnails/gtk/gtk.go
'';
buildPhase = ''
@ -49,10 +98,9 @@ buildGoPackage rec {
'';
installPhase = ''
make install PREFIX="$bin" SYSTEMD_LIB_DIR="$bin/lib" -C go/src/${goPackagePath}
mkdir -p $out/share
mv $bin/share/gocode $out/share/go
remove-references-to -t ${go} $bin/bin/* $bin/lib/deepin-api/*
make install PREFIX="$out" SYSTEMD_LIB_DIR="$out/lib" -C go/src/${goPackagePath}
mv $out/share/gocode $out/share/go
remove-references-to -t ${go} $out/bin/* $out/lib/deepin-api/*
'';
passthru.updateScript = deepin.updateScript { inherit name; };

View file

@ -1,4 +1,4 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
[
{
goPackagePath = "github.com/alecthomas/template";
@ -32,8 +32,8 @@
fetch = {
type = "git";
url = "https://github.com/disintegration/imaging";
rev = "9458da53d1e65e098d48467a4317c403327e4424";
sha256 = "1b0ma9if8s892qfx5b1vjinxn00ah9vsyxijs8knkilrhf5vqcx4";
rev = "061e8a750a4db9667cdf9e2af7f4029ba506cb3b";
sha256 = "13fkknwz2iby5rdzv9sgam6p27zdgxis3sxgyls9sdir5lbhjhm7";
};
}
{
@ -41,8 +41,8 @@
fetch = {
type = "git";
url = "https://github.com/fogleman/gg";
rev = "0e0ff3ade7039063fe954cc1b45fad6cd4ac80db";
sha256 = "06gvsngfwizdxin90nldix5503fqgnwqmqvxzrz0xg5hfazwfra5";
rev = "0403632d5b905943a1c2a5b2763aaecd568467ec";
sha256 = "1nkldjghbqnzj2djfaxhiv35kk341xhcrj9m2dwq65v684iqkk8n";
};
}
{
@ -59,8 +59,8 @@
fetch = {
type = "git";
url = "https://github.com/linuxdeepin/go-x11-client";
rev = "03541136501cab4910ad8852fe749ef8e18907ca";
sha256 = "1iiw8qclpklim81hz1sdjp2ajw0ljvjz19n9jly86nbw6m8x4gkp";
rev = "48c75d615ef634d9b1c24f8e8a30f56201b4f561";
sha256 = "1x2i9wg6lyskls5qi3d2r84bdhyhgi8v1d8scxx9ysjaw9di9ldl";
};
}
{
@ -77,8 +77,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/image";
rev = "69cc3646b96e61de0b417f4815b86c36e65783ee";
sha256 = "0nkywb3r0qvwkmykpswnf0svxi463ycn293y5jjididzxv9qxdp9";
rev = "3fc05d484e9f77dd51816890e05f2602e4ca4d65";
sha256 = "0mcip8jpz2061j1z658rfskphc92wv6sapy81p95bnjdymi562k3";
};
}
{
@ -86,8 +86,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "c44066c5c816ec500d459a2a324a753f78531ae0";
sha256 = "0mgww74bl15d0jvsh4f3qr1ckjzb8icb8hn0mgs5ppa0b2fgpc4f";
rev = "74de082e2cca95839e88aa0aeee5aadf6ce7710f";
sha256 = "0a4y3y0q5bkif7wvdkyjkvgnzlbh2n4zk7wsy5j95raf0i3zlw4s";
};
}
{

View file

@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
qmake
qttools
deepin-gettext-tools
deepin.setupHook
];
buildInputs = [
@ -27,11 +28,14 @@ stdenv.mkDerivation rec {
];
postPatch = ''
patchShebangs .
searchHardCodedPaths
patchShebangs translate_generation.sh
patchShebangs translate_desktop.sh
fixPath $out /usr com.deepin.Calendar.service
sed -i translate_desktop.sh \
-e "s,/usr/bin/deepin-desktop-ts-convert,deepin-desktop-ts-convert,"
sed -i com.deepin.Calendar.service \
-e "s,/usr,$out,"
'';
passthru.updateScript = deepin.updateScript { inherit name; };

View file

@ -1,13 +1,15 @@
{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch, pkgconfig,
dbus-factory, go-dbus-factory, go-gir-generator, go-lib,
deepin-gettext-tools, dde-api, alsaLib, glib, gtk3, libinput, libnl,
librsvg, linux-pam, networkmanager, pulseaudio, xorg, gnome3,
python3Packages, hicolor-icon-theme, go, deepin }:
deepin-gettext-tools, dde-api, deepin-desktop-schemas,
deepin-wallpapers, deepin-desktop-base, alsaLib, glib, gtk3,
libgudev, libinput, libnl, librsvg, linux-pam, networkmanager,
pulseaudio, xorg, python3, hicolor-icon-theme, glibc, tzdata, go,
deepin, makeWrapper, wrapGAppsHook }:
buildGoPackage rec {
name = "${pname}-${version}";
pname = "dde-daemon";
version = "3.6.0";
version = "3.24.1";
goPackagePath = "pkg.deepin.io/dde/daemon";
@ -15,15 +17,14 @@ buildGoPackage rec {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "0gn2zp34wg79lvzdfla6yb4gs3f9ll83kj765zvig1wpx51nq1aj";
sha256 = "1qxj0mqnl10qj8qidpc1sv8gm4gj5965i07d003yxlxcw9cqwx7y";
};
patches = [
# https://github.com/linuxdeepin/dde-daemon/issues/51
(fetchpatch {
name = "dde-daemon_3.2.3.patch";
url = https://github.com/jouyouyun/tap-gesture-patches/raw/master/patches/dde-daemon_3.2.3.patch;
sha256 = "0a3xb15czpfl2vajpf7ycw37vr7fbw2png1a67mvjjkgx7d1k7dg";
url = https://github.com/jouyouyun/tap-gesture-patches/raw/master/patches/dde-daemon_3.8.0.patch;
sha256 = "1ampdsp9zlg263flswdw9gj10n7gxh7zi6w6z9jgh29xlai05pvh";
})
];
@ -38,46 +39,70 @@ buildGoPackage rec {
go-gir-generator
go-lib
deepin-gettext-tools
dde-api
linux-pam
networkmanager
networkmanager.dev
python3Packages.python
python3
makeWrapper
wrapGAppsHook
deepin.setupHook
];
buildInputs = [
alsaLib
dde-api
deepin-desktop-base
deepin-desktop-schemas
deepin-wallpapers
glib
gnome3.libgudev
libgudev
gtk3
hicolor-icon-theme
libinput
libnl
librsvg
pulseaudio
tzdata
];
postPatch = ''
patchShebangs .
searchHardCodedPaths
patchShebangs network/nm_generator/gen_nm_consts.py
sed -i network/nm_generator/Makefile -e 's,/usr/share/gir-1.0/NM-1.0.gir,${networkmanager.dev}/share/gir-1.0/NM-1.0.gir,'
fixPath $out /usr/share/dde/data launcher/manager.go dock/dock_manager_init.go
fixPath ${networkmanager.dev} /usr/share/gir-1.0/NM-1.0.gir network/nm_generator/Makefile
fixPath ${glibc.bin} /usr/bin/getconf systeminfo/utils.go
fixPath ${deepin-desktop-base} /etc/deepin-version systeminfo/version.go accounts/deepinversion.go
fixPath ${tzdata} /usr/share/zoneinfo timedate/zoneinfo/zone.go
fixPath ${dde-api} /usr/lib/deepin-api grub2/modify_manger.go accounts/image_blur.go
fixPath ${deepin-wallpapers} /usr/share/wallpapers appearance/background/list.go accounts/user.go
sed -i -e "s|{DESTDIR}/etc|{DESTDIR}$out/etc|" Makefile
sed -i -e "s|{DESTDIR}/var|{DESTDIR}$out/var|" Makefile
sed -i -e "s|{DESTDIR}/lib|{DESTDIR}$out/lib|" Makefile
find -type f -exec sed -i -e "s,/usr/lib/deepin-daemon,$out/lib/deepin-daemon," {} +
searchHardCodedPaths
'';
buildPhase = ''
make -C go/src/${goPackagePath}
# compilation of the nm module is failing
#make -C go/src/${goPackagePath}/network/nm_generator gen-nm-code
make -C go/src/${goPackagePath}
'';
installPhase = ''
make install PREFIX="$out" -C go/src/${goPackagePath}
remove-references-to -t ${go} $out/lib/deepin-daemon/*
searchHardCodedPaths $out
'';
postFixup = ''
# wrapGAppsHook does not work with binaries outside of $out/bin or $out/libexec
for binary in $out/lib/deepin-daemon/*; do
wrapProgram $binary "''${gappsWrapperArgs[@]}"
done
'';
passthru.updateScript = deepin.updateScript { inherit name; };

View file

@ -1,4 +1,4 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
[
{
goPackagePath = "github.com/alecthomas/template";
@ -41,8 +41,8 @@
fetch = {
type = "git";
url = "https://github.com/linuxdeepin/go-x11-client";
rev = "03541136501cab4910ad8852fe749ef8e18907ca";
sha256 = "1iiw8qclpklim81hz1sdjp2ajw0ljvjz19n9jly86nbw6m8x4gkp";
rev = "48c75d615ef634d9b1c24f8e8a30f56201b4f561";
sha256 = "1x2i9wg6lyskls5qi3d2r84bdhyhgi8v1d8scxx9ysjaw9di9ldl";
};
}
{
@ -50,8 +50,8 @@
fetch = {
type = "git";
url = "https://github.com/msteinert/pam";
rev = "f4cd9f5e29232537a12db1678f48c702ad6896b7";
sha256 = "1vjawxswy3f23v4d72kk95y3b557580670ai9ffvrwy6wy85qync";
rev = "f29b9f28d6f9a1f6c4e6fd5db731999eb946574b";
sha256 = "1v5z51mgyz2glm7v0mg60xs1as88wx6cqhys2khc5d3khkr8q0qp";
};
}
{
@ -68,8 +68,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/image";
rev = "69cc3646b96e61de0b417f4815b86c36e65783ee";
sha256 = "0nkywb3r0qvwkmykpswnf0svxi463ycn293y5jjididzxv9qxdp9";
rev = "3fc05d484e9f77dd51816890e05f2602e4ca4d65";
sha256 = "0mcip8jpz2061j1z658rfskphc92wv6sapy81p95bnjdymi562k3";
};
}
{
@ -77,8 +77,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "c44066c5c816ec500d459a2a324a753f78531ae0";
sha256 = "0mgww74bl15d0jvsh4f3qr1ckjzb8icb8hn0mgs5ppa0b2fgpc4f";
rev = "74de082e2cca95839e88aa0aeee5aadf6ce7710f";
sha256 = "0a4y3y0q5bkif7wvdkyjkvgnzlbh2n4zk7wsy5j95raf0i3zlw4s";
};
}
{
@ -86,8 +86,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
rev = "6f44c5a2ea40ee3593d98cdcc905cc1fdaa660e2";
sha256 = "00mwzxly5isgf0glz7k3k2dkyqkjfc4z55qxajx4lgcp3h8xn9xj";
rev = "e3703dcdd614d2d7488fff034c75c551ea25da95";
sha256 = "1xh106aslp04vbzb4hc7cc5fyg2ljwny8fwfwsp5mpbqr9ixkikv";
};
}
{
@ -104,8 +104,8 @@
fetch = {
type = "git";
url = "https://github.com/linuxdeepin/go-lib.git";
rev = "b199d0dc96e979398ea3985334ccf9c20236d1a7";
sha256 = "0g84v1adnnyqc1mv45n3wlvnivkm1fi8ywszzgwx8irl3iddfvxv";
rev = "3558b2348565e983c7d4a57a0a21bbe716a55b83";
sha256 = "0p9yrxa3x71n3jxffh03ahjgimdzvxzhny632k363lkha6glvbnc";
};
}
]

View file

@ -0,0 +1,51 @@
{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, polkit-qt,
dtkcore, dtkwidget, dde-qt-dbus-factory, deepin }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "dde-polkit-agent";
version = "0.2.4";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "1x7mv63g8412w1bq7fijsdzi8832qjb6gnr1nykcv7imzlycq9m6";
};
nativeBuildInputs = [
pkgconfig
qmake
qttools
deepin.setupHook
];
buildInputs = [
dde-qt-dbus-factory
dtkcore
dtkwidget
polkit-qt
];
postPatch = ''
searchHardCodedPaths
patchShebangs translate_generation.sh
fixPath $out /usr dde-polkit-agent.pro polkit-dde-authentication-agent-1.desktop
fixPath /run/current-system/sw /usr/lib/polkit-1-dde/plugins pluginmanager.cpp
'';
postFixup = ''
searchHardCodedPaths $out
'';
passthru.updateScript = deepin.updateScript { inherit name; };
meta = with stdenv.lib; {
description = "PolicyKit agent for Deepin Desktop Environment";
homepage = https://github.com/linuxdeepin/dde-polkit-agent;
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ romildo ];
};
}

View file

@ -1,25 +1,28 @@
{ stdenv, fetchFromGitHub, pkgconfig, qmake, python, deepin }:
{ stdenv, fetchFromGitHub, pkgconfig, qmake, python3, deepin }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "dde-qt-dbus-factory";
version = "1.0.5";
version = "1.1.1";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "0cz55hsbhy1ab1mndv0sp6xnqrhz2y66w7pcxy8v9k87ii32czf8";
sha256 = "1b2i5m6fzkga72hbl85v2rng3qq53di39p7jj2f119wmlfbyp2vg";
};
nativeBuildInputs = [
qmake
python
python3
deepin.setupHook
];
postPatch = ''
sed -i libdframeworkdbus/{DFrameworkdbusConfig.in,libdframeworkdbus.pro} \
-e "s,/usr,$out,"
searchHardCodedPaths
fixPath $out /usr \
libdframeworkdbus/DFrameworkdbusConfig.in \
libdframeworkdbus/libdframeworkdbus.pro
'';
enableParallelBuilding = true;

View file

@ -1,18 +1,18 @@
{ stdenv, fetchFromGitHub, pkgconfig, qmake, qtsvg, qttools,
qtx11extras, xkeyboard_config, xorg, lightdm_qt, gsettings-qt,
dde-qt-dbus-factory, deepin-gettext-tools, dtkcore, dtkwidget,
hicolor-icon-theme, deepin }:
deepin-desktop-schemas, deepin, hicolor-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "dde-session-ui";
version = "4.6.2";
version = "4.9.0";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "1fxlrj7vv7nqllwpwc8mxiv9bfqcj9b2qwkpjaq326pfmg5p5lhq";
sha256 = "1bh7wbkzikcnka94nzqzl87cs2m6bslrv9r2hdsvqqr3aaad5za3";
};
nativeBuildInputs = [
@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
qmake
qttools
deepin-gettext-tools
wrapGAppsHook
deepin.setupHook
];
buildInputs = [
@ -35,10 +37,13 @@ stdenv.mkDerivation rec {
xorg.libXtst
xkeyboard_config
hicolor-icon-theme
deepin-desktop-schemas
];
postPatch = ''
patchShebangs .
searchHardCodedPaths
patchShebangs translate_generation.sh
patchShebangs translate_desktop.sh
sed -i translate_desktop.sh -e "s,/usr/bin/deepin-desktop-ts-convert,deepin-desktop-ts-convert,"
find -type f -exec sed -i -e "s,path = /etc,path = $out/etc," {} +
find -type f -exec sed -i -e "s,path = /usr,path = $out," {} +

View file

@ -3,34 +3,40 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "deepin-desktop-base";
version = "2018.10.29";
version = "2019.03.29";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "0l2zb7rpag2q36lqsgvirhjgmj7w243nsi1rywkypf2xm7g2v235";
sha256 = "1d016h95nsn5yay9f4c13hixfxj0q01hpxwj2x84i6qpx63dxdwq";
};
nativeBuildInputs = [ deepin.setupHook ];
buildInputs = [ deepin-wallpapers ];
# TODO: Fedora recommended dependencies:
# deepin-wallpapers
# plymouth-theme-deepin
postPatch = ''
sed -i Makefile -e "s:/usr:$out:" -e "s:/etc:$out/etc:"
searchHardCodedPaths
fixPath $out /etc Makefile
fixPath $out /usr Makefile
# Remove Deepin distro's lsb-release
# Don't override systemd timeouts
# Remove apt-specific templates
echo ----------------------------------------------------------------
echo grep --color=always -E 'lsb-release|systemd|python-apt|backgrounds' Makefile
grep --color=always -E 'lsb-release|systemd|python-apt|backgrounds' Makefile
echo ----------------------------------------------------------------
sed -i -E '/lsb-release|systemd|python-apt|backgrounds/d' Makefile
'';
postInstall = ''
# Remove Deepin distro's lsb-release
rm $out/etc/lsb-release
# Don't override systemd timeouts
rm -r $out/etc/systemd
# Remove apt-specific templates
rm -r $out/share/python-apt
# Remove empty backgrounds directory
rm -r $out/share/backgrounds
# Make a symlink for deepin-version
ln -s ../lib/deepin/desktop-version $out/etc/deepin-version
'';
@ -39,6 +45,14 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Base assets and definitions for Deepin Desktop Environment";
# TODO: revise
longDescription = ''
This package provides some components for Deepin desktop environment.
- deepin logo
- deepin desktop version
- login screen background image
- language information
'';
homepage = https://github.com/linuxdeepin/deepin-desktop-base;
license = licenses.gpl3;
platforms = platforms.linux;

View file

@ -1,21 +1,22 @@
{ stdenv, fetchFromGitHub, python, deepin-gtk-theme,
deepin-icon-theme, deepin-sound-theme, deepin-wallpapers, gnome3,
deepin }:
{ stdenv, fetchFromGitHub, python3, gnome3, glib, deepin-gtk-theme,
deepin-icon-theme, deepin-sound-theme, deepin-wallpapers, deepin }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "deepin-desktop-schemas";
version = "3.4.0";
version = "3.13.0";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "10x0rh9z925yzyp8h0vgmg4313smvran06lvr12c3931qkmkzwgq";
sha256 = "0bamjcpmsl8xhw3ksgl11wv5xwcdhrkl1namikfzc4an03sk1rdq";
};
nativeBuildInputs = [
python
python3
glib.dev
deepin.setupHook
];
buildInputs = [
@ -27,12 +28,34 @@ stdenv.mkDerivation rec {
];
postPatch = ''
searchHardCodedPaths
# fix default background url
sed -i '/picture-uri/s|/usr/share/backgrounds/default_background.jpg|$out/share/backgrounds/deepin/default.png|' \
sed -i -e 's,/usr/share/backgrounds/default_background.jpg,/usr/share/backgrounds/deepin/desktop.jpg,' \
overrides/common/com.deepin.wrap.gnome.desktop.override
fixPath ${deepin-wallpapers} /usr/share/backgrounds \
overrides/common/com.deepin.wrap.gnome.desktop.override
fixPath ${deepin-wallpapers} /usr/share/wallpapers/deepin \
schemas/com.deepin.dde.appearance.gschema.xml
# still hardcoded paths:
# /etc/gnome-settings-daemon/xrandr/monitors.xml ? gnome3.gnome-settings-daemon
# /usr/share/backgrounds/gnome/adwaita-lock.jpg ? gnome3.gnome-backgrounds
# /usr/share/backgrounds/gnome/adwaita-timed.xml gnome3.gnome-backgrounds
# /usr/share/desktop-directories
'';
makeFlags = [ "PREFIX=$(out)" ];
makeFlags = [ "PREFIX=${placeholder ''out''}" ];
doCheck = true;
checkTarget = "test";
postInstall = ''
glib-compile-schemas --strict $out/share/glib-2.0/schemas
searchHardCodedPaths $out
'';
passthru.updateScript = deepin.updateScript { inherit name; };

View file

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
python3Packages.python
];
makeFlags = [ "PREFIX=$(out)" ];
makeFlags = [ "PREFIX=${placeholder ''out''}" ];
postPatch = ''
sed -e 's/sudo cp/cp/' -i src/generate_mo.py

View file

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
makeFlags = [ "PREFIX=$(out)" ];
makeFlags = [ "PREFIX=${placeholder ''out''}" ];
passthru.updateScript = deepin.updateScript { inherit name; };

View file

@ -1,29 +1,39 @@
{ stdenv, fetchFromGitHub, gtk3, papirus-icon-theme, deepin }:
{ stdenv, fetchFromGitHub, gtk3, xcursorgen, papirus-icon-theme, deepin }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "deepin-icon-theme";
version = "15.12.64";
version = "15.12.68";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "0z1yrp6yg2hb67azrbd9ac743jjh83vxdf2j0mmv2lfpd4fqw8qc";
sha256 = "12jgz81s5qggmnkfg9m5f799r10p43qmh4zqxl1kjvlrqgvsc9rf";
};
nativeBuildInputs = [ gtk3 papirus-icon-theme ];
nativeBuildInputs = [ gtk3 xcursorgen ];
buildInputs = [ papirus-icon-theme ];
postPatch = ''
patchShebangs .
# install in $out
sed -i -e "s|/usr|$out|g" Makefile tools/hicolor.links
patchShebangs tools/hicolor.links
patchShebangs tools/display_unused_links.sh
patchShebangs cursors-src/cursors/bitmaps/make.sh
patchShebangs cursors-src/render-cursors.sh
# keep icon-theme.cache
sed -i -e 's|\(-rm -f .*/icon-theme.cache\)|# \1|g' Makefile
'';
buildTargets = "all hicolor-links";
installTargets = "install-icons install-cursors";
installFlags = [ "PREFIX=${placeholder ''out''}" ];
postInstall = ''
cp -a ./Sea ./usr/share/icons/hicolor "$out"/share/icons/
'';
passthru.updateScript = deepin.updateScript { inherit name; };
meta = with stdenv.lib; {

View file

@ -6,19 +6,20 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "deepin-image-viewer";
version = "1.3.1";
version = "1.3.10";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "0dxdvm6hzj6izfxka35za8y7vacd06nksfgzx6xsv7ywzagri4k5";
sha256 = "0paanw9sd67ic9yrbzqhrwi4bf4lpvsk16jynx99n76j3jgyijkk";
};
nativeBuildInputs = [
pkgconfig
qmake
qttools
deepin.setupHook
];
buildInputs = [
@ -33,12 +34,12 @@ stdenv.mkDerivation rec {
];
postPatch = ''
patchShebangs .
searchHardCodedPaths
patchShebangs viewer/generate_translations.sh
fixPath $out /usr viewer/com.deepin.ImageViewer.service
sed -i qimage-plugins/freeimage/freeimage.pro \
qimage-plugins/libraw/libraw.pro \
-e "s,\$\$\[QT_INSTALL_PLUGINS\],$out/$qtPluginPrefix,"
sed -i viewer/com.deepin.ImageViewer.service \
-e "s,/usr,$out,"
'';
passthru.updateScript = deepin.updateScript { inherit name; };

View file

@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
pkgconfig
qmake
deepin.setupHook
];
buildInputs = [
@ -25,7 +26,11 @@ stdenv.mkDerivation rec {
];
postPatch = ''
sed -i deepin-menu.pro -e "s,/usr,$out,"
searchHardCodedPaths
fixPath $out /usr \
data/com.deepin.menu.service \
deepin-menu.desktop \
deepin-menu.pro
'';
enableParallelBuilding = true;

View file

@ -1,25 +1,26 @@
{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, gtk3, libgtop, bamf,
json-glib, libcanberra-gtk3, libxkbcommon, libstartup_notification,
deepin-wallpapers, deepin-desktop-schemas, deepin }:
{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, glib,
gtk3, libgtop, bamf, json-glib, libcanberra-gtk3, libxkbcommon,
libstartup_notification, deepin-wallpapers, deepin-desktop-schemas,
deepin }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "deepin-metacity";
version = "3.22.22";
version = "3.22.24";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "0gr10dv8vphla6z7zqiyyg3n3ag4rrlz43c4kr7fd5xwx2bfvp3d";
sha256 = "1im0wz1zlxiag4kpp5d4hv0aa0ybr4bizarr3903hrqv0lp46hyx";
};
nativeBuildInputs = [
pkgconfig
intltool
libtool
glib.dev
gnome3.gnome-common
gnome3.glib.dev
];
buildInputs = [
@ -41,7 +42,7 @@ stdenv.mkDerivation rec {
-e 's;/usr/share/backgrounds/default_background.jpg;${deepin-wallpapers}/share/backgrounds/deepin/desktop.jpg;'
'';
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
configureFlags = [ "--disable-themes-documentation" ];

View file

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "deepin-movie-reborn";
version = "3.2.14";
version = "3.2.21";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "1i9sdg2p6qp57rqzrnjbxnqj3mg1qggzyq3yykw271vs8h85a707";
sha256 = "09a4sirbdxnrwj9ww2v7b1s9ylsincqzpqm2zisny9zxy22fm8s9";
};
nativeBuildInputs = [

View file

@ -1,17 +1,19 @@
{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, gtk3, xorg,
libcanberra-gtk3, upower, xkeyboard_config, libxkbcommon,
libstartup_notification, libinput, cogl, clutter, systemd, deepin }:
{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, gtk3,
xorg, libcanberra-gtk3, upower, xkeyboard_config, libxkbcommon,
libstartup_notification, libinput, libgudev, cogl, clutter, systemd,
gsettings-desktop-schemas, deepin-desktop-schemas, wrapGAppsHook,
deepin }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "deepin-mutter";
version = "3.20.35";
version = "3.20.38";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "0mwk06kgw8qp8rg1j6px1zlya4x5rr9llax0qks59j56b3m9yim7";
sha256 = "1aq7606sgn2c6n8wfgxdryw3lprc4va0zjc0r65798w5656fdi31";
};
nativeBuildInputs = [
@ -19,27 +21,32 @@ stdenv.mkDerivation rec {
intltool
libtool
gnome3.gnome-common
wrapGAppsHook
deepin.setupHook
];
buildInputs = [
gtk3
gnome3.gnome-desktop
gnome3.gsettings-desktop-schemas
gnome3.libgudev
gnome3.zenity
upower
xorg.libxkbfile
libxkbcommon
libcanberra-gtk3
libstartup_notification
libinput
xkeyboard_config
cogl
clutter
cogl
deepin-desktop-schemas
gnome3.gnome-desktop
gnome3.zenity
gsettings-desktop-schemas
gtk3
libcanberra-gtk3
libgudev
libinput
libstartup_notification
libxkbcommon
systemd
upower
xkeyboard_config
xorg.libxkbfile
];
enableParallelBuilding = true;
postPatch = ''
searchHardCodedPaths
'';
configureFlags = [
"--enable-native-backend"
@ -50,6 +57,8 @@ stdenv.mkDerivation rec {
NOCONFIGURE=1 ./autogen.sh
'';
enableParallelBuilding = true;
passthru.updateScript = deepin.updateScript { inherit name; };
meta = with stdenv.lib; {

View file

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "1sw4nrn7q7wk1hpicm05apyc0mihaw42iqm52wb8ib8gm1qiylr9";
};
makeFlags = [ "PREFIX=$(out)" ];
makeFlags = [ "PREFIX=${placeholder ''out''}" ];
passthru.updateScript = deepin.updateScript { inherit name; };

View file

@ -1,19 +1,19 @@
{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, cmake, ninja, vala,
gettext, gobject-introspection, at-spi2-core, dbus, epoxy, expect,
gtk3, json-glib, libXdmcp, libgee, libpthreadstubs, librsvg,
libsecret, libtasn1, libxcb, libxkbcommon, p11-kit, pcre, vte, wnck,
deepin-menu, deepin-shortcut-viewer, deepin }:
gettext, at-spi2-core, dbus, epoxy, expect, gtk3, json-glib,
libXdmcp, libgee, libpthreadstubs, librsvg, libsecret, libtasn1,
libxcb, libxkbcommon, p11-kit, pcre, vte, wnck, libselinux,
libsepol, utillinux, deepin-menu, deepin-shortcut-viewer, deepin }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "deepin-terminal";
version = "3.0.10.2";
version = "3.2.1.2";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = "deepin-terminal";
rev = version;
sha256 = "0ylhp8q9kfdq9l69drawjaf0q8vcqyflb2a3zfnwbnf06dlpvkz6";
sha256 = "0dj386csbiw0yqz9nj6ij0s4d0ak9lpq2bmsfs17bjkgdp0ayp90";
};
nativeBuildInputs = [
@ -22,7 +22,8 @@ stdenv.mkDerivation rec {
ninja
vala
gettext
gobject-introspection # For setup hook
libselinux libsepol utillinux # required by gio
deepin.setupHook
];
buildInputs = [
@ -49,15 +50,19 @@ stdenv.mkDerivation rec {
];
postPatch = ''
patchShebangs .
searchHardCodedPaths
'';
enableParallelBuilding = true;
cmakeFlags = [
"-DTEST_BUILD=OFF"
"-DUSE_VENDOR_LIB=OFF"
"-DVERSION=${version}"
];
passthru.updateScript = deepin.updateScript { inherit name; };
meta = with stdenv.lib; {
description = "The default terminal emulation for Deepin";
description = "Default terminal emulator for Deepin";
longDescription = ''
Deepin terminal, it sharpens your focus in the world of command line!
It is an advanced terminal emulator with workspace, multiple

View file

@ -3,19 +3,21 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "deepin-wallpapers";
version = "1.7.5";
version = "1.7.7";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = "deepin-wallpapers";
rev = version;
sha256 = "0mfjkh81ci0gjwmgycrh32by7v9b73nyvyjbqd29ccpb8bpyyakn";
sha256 = "09cfnxbpms98ibqbi4xd51181q3az5n8rmndcdr9w12kyzniz7xv";
};
nativeBuildInputs = [ dde-api.bin ];
nativeBuildInputs = [ dde-api deepin.setupHook ];
postPatch = ''
sed -i -e "s:/usr/lib/deepin-api:${dde-api.bin}/lib/deepin-api:" Makefile
searchHardCodedPaths # debugging
sed -i -e "s:/usr/lib/deepin-api:${dde-api}/lib/deepin-api:" Makefile
sed -i -e "s:/usr/share/wallpapers:$out/share/wallpapers:" Makefile
'';

View file

@ -1,49 +1,55 @@
{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, vala, gnome3,
bamf, clutter-gtk, pantheon, libcanberra-gtk3, libwnck3,
deepin-mutter, deepin-wallpapers, deepin-desktop-schemas,
hicolor-icon-theme, deepin }:
bamf, clutter-gtk, pantheon, libgee, libcanberra-gtk3, libwnck3,
deepin-menu, deepin-mutter, deepin-wallpapers,
deepin-desktop-schemas, wrapGAppsHook, deepin }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "deepin-wm";
version = "1.9.34";
version = "1.9.37";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "13hydcalifdc6723k8l4pk905y9sxic5x1fqww0fyx7j6b3hm13f";
sha256 = "1xd2x0kyav2cxnk0bybl7lrmak1r2468slxz5a6anrdriw9l10gi";
};
nativeBuildInputs = [
pkgconfig
intltool
libtool
gnome3.gnome-common
vala
gnome3.gnome-common
wrapGAppsHook
deepin.setupHook
];
buildInputs = [
gnome3.gnome-desktop
gnome3.libgee
bamf
clutter-gtk
pantheon.granite
libcanberra-gtk3
libwnck3
deepin-desktop-schemas
deepin-menu
deepin-mutter
deepin-wallpapers
deepin-desktop-schemas
hicolor-icon-theme
gnome3.gnome-desktop
libcanberra-gtk3
libgee
libwnck3
pantheon.granite
];
postPatch = ''
sed -i src/Background/BackgroundSource.vala \
-e 's;/usr/share/backgrounds/default_background.jpg;${deepin-wallpapers}/share/backgrounds/deepin/desktop.jpg;'
searchHardCodedPaths
fixPath ${deepin-wallpapers} /usr/share/backgrounds src/Background/BackgroundSource.vala
# fix background path
sed -i 's|default_background.jpg|deepin/desktop.jpg|' src/Background/BackgroundSource.vala
'';
NIX_CFLAGS_COMPILE = "-DWNCK_I_KNOW_THIS_IS_UNSTABLE";
preConfigure = ''
./autogen.sh
NOCONFIGURE=1 ./autogen.sh
'';
enableParallelBuilding = true;

View file

@ -2,6 +2,8 @@
let
packages = self: with self; {
setupHook = ./setup-hook.sh;
updateScript = callPackage ./update.nix { };
dbus-factory = callPackage ./dbus-factory { };
@ -14,6 +16,7 @@ let
# XXX: the build is finding references to Go when compiled with go v1.12
go = go_1_11;
};
dde-polkit-agent = callPackage ./dde-polkit-agent { };
dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { };
dde-session-ui = callPackage ./dde-session-ui { };
deepin-desktop-base = callPackage ./deepin-desktop-base { };
@ -29,11 +32,11 @@ let
deepin-shortcut-viewer = callPackage ./deepin-shortcut-viewer { };
deepin-sound-theme = callPackage ./deepin-sound-theme { };
deepin-terminal = callPackage ./deepin-terminal {
inherit (pkgs.gnome3) libgee;
wnck = pkgs.libwnck3;
};
deepin-wallpapers = callPackage ./deepin-wallpapers { };
deepin-wm = callPackage ./deepin-wm { };
dpa-ext-gnomekeyring = callPackage ./dpa-ext-gnomekeyring { };
dtkcore = callPackage ./dtkcore { };
dtkwm = callPackage ./dtkwm { };
dtkwidget = callPackage ./dtkwidget { };

View file

@ -0,0 +1,43 @@
{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, gnome3,
dde-polkit-agent, deepin }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "dpa-ext-gnomekeyring";
version = "0.1.0";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "168j42nwyw7vcgwc0fha2pjpwwlgir70fq1hns4ia1dkdqa1nhzw";
};
nativeBuildInputs = [
pkgconfig
qmake
qttools
deepin.setupHook
];
buildInputs = [
dde-polkit-agent
gnome3.libgnome-keyring
];
postPatch = ''
searchHardCodedPaths
patchShebangs translate_generation.sh
fixPath $out /usr dpa-ext-gnomekeyring.pro gnomekeyringextention.cpp
'';
passthru.updateScript = deepin.updateScript { inherit name; };
meta = with stdenv.lib; {
description = "GNOME keyring extension for dde-polkit-agent";
homepage = https://github.com/linuxdeepin/dpa-ext-gnomekeyring;
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ romildo ];
};
}

View file

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "dtkcore";
version = "2.0.9.8";
version = "2.0.10";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "06jj5gpy2qbmc21nf0fnbvgw7nbjjgvzx7m2vg9byw5il8l4g22h";
sha256 = "0dwpq6c38gaa95mgjnwj3vjz57n0cz6jfk950xi6s9ww2f4g6kq7";
};
nativeBuildInputs = [

View file

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "dtkwidget";
version = "2.0.9.10";
version = "2.0.10";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "0757dzy82bfv97b1gzkwa9zx3jzfbap20v3r1h7lkfcfw95410iw";
sha256 = "11a7yirfkcj3rq7va9av4m1pr22mq1yx1j9k18xrqv36n0rlbrr6";
};
nativeBuildInputs = [

View file

@ -3,16 +3,16 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "go-dbus-factory";
version = "0.0.7.1";
version = "0.4.0";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "0gj2xxv45gh7wr5ry3mcsi46kdsyq9nbd7znssn34kapiv40ixcx";
sha256 = "1i1ymi2qpcbf4d6rnfzrbq5n2vwnn8dvbq9xlw7jls3jpr3d5r00";
};
makeFlags = [ "PREFIX=$(out)" ];
makeFlags = [ "PREFIX=${placeholder ''out''}" ];
postPatch = ''
sed -i -e 's:/share/gocode:/share/go:' Makefile

View file

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
];
makeFlags = [
"PREFIX=$(out)"
"PREFIX=${placeholder ''out''}"
"GOCACHE=$(TMPDIR)/go-cache"
];

View file

@ -4,23 +4,15 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "go-gir-generator";
version = "1.1.0";
version = "2.0.0";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "0grp4ffy3vmlknzmymnxq1spwshff2ylqsw82pj4y2v2fcvnqfvb";
sha256 = "0d93qzp3dlia5d1yxw0rwca76qk3jyamj9xzmk13vzig8zw0jx16";
};
patches = [
# fix: dde-api build error with gobject-introspection 1.58+
(fetchurl {
url = https://github.com/linuxdeepin/go-gir-generator/commit/a7ab229201e28d1be727f5021b3588fa4a1acf5f.patch;
sha256 = "13ywalwkjg8wwvd0pvmc2rv1h38airyvimdn9jfb5wis9xm48401";
})
];
nativeBuildInputs = [
pkgconfig
go
@ -36,7 +28,7 @@ stdenv.mkDerivation rec {
'';
makeFlags = [
"PREFIX=$(out)"
"PREFIX=${placeholder ''out''}"
"GOCACHE=$(TMPDIR)/go-cache"
];

View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "go-lib";
version = "1.3.0";
version = "1.10.0";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "0g84v1adnnyqc1mv45n3wlvnivkm1fi8ywszzgwx8irl3iddfvxv";
sha256 = "090l33y79gdj2xy1bhk2ksl6hvmsfhmx0bhygm4y4d0iqckf2x2m";
};
buildInputs = [
@ -21,10 +21,12 @@ stdenv.mkDerivation rec {
mobile-broadband-provider-info
];
makeFlags = [
"PREFIX=$(out)"
"GOSITE_DIR=$(out)/share/go"
];
installPhase = ''
mkdir -p $out/share/go/src/pkg.deepin.io/lib
cp -a * $out/share/go/src/pkg.deepin.io/lib
rm -r $out/share/go/src/pkg.deepin.io/lib/debian
'';
passthru.updateScript = deepin.updateScript { inherit name; };

View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "qt5dxcb-plugin";
version = "1.1.13";
version = "1.1.25";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "12lvh3agw3qdviqf32brmzba5kscnj5al5jhc08lq69a9kmip05x";
sha256 = "1nadmj1hdpw4n3kpk3dlx22bmxdli66abhjl73hwrbvszmmcm9vp";
};
nativeBuildInputs = [

View file

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "qt5integration";
version = "0.3.6";
version = "0.3.8";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
sha256 = "1v9whlqn07c5c8xnaiicdshj9n88a667gfbn8y8bk5bfylilfzcy";
sha256 = "12d6iv2x0q2n73rscma30q31nh7h26gmhlf665gkgl2j825hlx5n";
};
nativeBuildInputs = [

View file

@ -0,0 +1,53 @@
# Helper functions for deepin packaging
searchHardCodedPaths() {
# looks for ocurrences of hard coded paths in given (current)
# directory and command invocations for the purpose of debugging a
# derivation
local dir=$1
echo ----------- looking for command invocations
grep --color=always -r -E '\<(ExecStart|Exec|startDetached|execute|exec\.(Command|LookPath))\>' $dir || true
echo ----------- looking for hard coded paths
grep --color=always -r -E '/(usr|bin|sbin|etc|var|opt)\>' $dir || true
echo ----------- done
}
fixPath() {
# Usage:
#
# fixPath <parent dir> <path> <files>
#
# replaces occurences of <path> by <parent_dir><path> in <files>
# removing /usr from the start of <path> if present
local parentdir=$1
local path=$2
local newpath=$parentdir$(echo $path | sed "s,^/usr,,")
local files=("${@:3}")
echo ======= grep --color=always "${path}" "${files[@]}"
grep --color=always "${path}" "${files[@]}"
echo +++++++ sed -i -e "s,$path,$newpath,g" "${files[@]}"
sed -i -e "s,$path,$newpath,g" "${files[@]}"
}
searchForUnresolvedDLL() {
# Usage:
#
# searchForUnresolvedDLL <dir>
#
# looks in <dir> for executables with unresolved dynamic library paths
local dir="$1"
echo ======= Looking for executables with unresolved dynamic library dependencies
echo $dir
for f in $(find -L "$dir" -type f -executable); do
if (ldd $f | grep -q "not found"); then
echo $f
ldd $f | grep --color=always "not found"
fi
done
}

View file

@ -1,5 +1,5 @@
{ stdenv, lib, writeScript, coreutils, curl, gnugrep, gnused, jq, common-updater-scripts, nix }:
{ name, ignored-versions ? "^2014\\.|^v[0-9]+" }:
{ name, ignored-versions ? "^2014(\\.|rc)|^v[0-9]+" }:
let
nameAndVersion = builtins.parseDrvName name;