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

Merge staging into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-09-29 11:05:22 +02:00
parent 9b09b832fc 52af1d0930
commit 503081fa5b
219 changed files with 3102 additions and 2180 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/data/icons/arc-icon-theme/default.nix
+7 -1
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, autoreconfHook, gtk3, moka-icon-theme }:
{ stdenv, fetchFromGitHub, autoreconfHook, gtk3, moka-icon-theme, hicolor-icon-theme }:
stdenv.mkDerivation rec {
name = "${package-name}-${version}";
@@ -14,6 +14,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook gtk3 moka-icon-theme ];
propagatedBuildInputs = [
hicolor-icon-theme
];
dontDropIconThemeCache = true;
postFixup = "gtk-update-icon-cache $out/share/icons/Arc";
meta = with stdenv.lib; {
pkgs/data/icons/elementary-xfce-icon-theme/default.nix
+7 -1
View File
@@ -11,7 +11,13 @@ stdenv.mkDerivation rec {
sha256 = "16msdrazhbv80cvh5ffvgj13xmkpf87r7mq6xz071fza6nv7g0jn";
};
nativeBuildInputs = [ pkgconfig gdk-pixbuf librsvg optipng gtk3 hicolor-icon-theme ];
nativeBuildInputs = [ pkgconfig gdk-pixbuf librsvg optipng gtk3 ];
propagatedBuildInputs = [
hicolor-icon-theme
];
dontDropIconThemeCache = true;
postPatch = ''
substituteInPlace svgtopng/Makefile --replace "-O0" "-O"
pkgs/data/icons/faba-icon-theme/default.nix
+7 -1
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, meson, ninja, python3, gtk3, pantheon }:
{ stdenv, fetchFromGitHub, meson, ninja, python3, gtk3, pantheon, hicolor-icon-theme }:
stdenv.mkDerivation rec {
name = "${package-name}-${version}";
@@ -14,6 +14,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja python3 gtk3 pantheon.elementary-icon-theme ];
propagatedBuildInputs = [
hicolor-icon-theme
];
dontDropIconThemeCache = true;
postPatch = ''
patchShebangs meson/post_install.py
'';
pkgs/data/icons/faba-mono-icons/default.nix
+7 -1
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, autoreconfHook, gtk3, moka-icon-theme }:
{ stdenv, fetchFromGitHub, autoreconfHook, gtk3, moka-icon-theme, hicolor-icon-theme }:
stdenv.mkDerivation rec {
pname = "faba-mono-icons";
@@ -13,6 +13,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook gtk3 moka-icon-theme ];
propagatedBuildInputs = [
hicolor-icon-theme
];
dontDropIconThemeCache = true;
postFixup = ''
for theme in $out/share/icons/*; do
gtk-update-icon-cache $theme
pkgs/data/icons/hicolor-icon-theme/setup-hook.sh
+4 -12
View File
@@ -1,21 +1,13 @@
# shellcheck shell=bash
# Populate XDG_ICON_DIRS
hicolorIconThemeHook() {
# where to find icon themes
if [ -d "$1/share/icons" ]; then
addToSearchPath XDG_ICON_DIRS $1/share
addToSearchPath XDG_ICON_DIRS "$1/share"
fi
}
# I think this is meant to be a runtime dep
addEnvHooks "$hostOffset" hicolorIconThemeHook
# Remove icon cache
hicolorPreFixupPhase() {
rm -f $out/share/icons/hicolor/icon-theme.cache
rm -f $out/share/icons/HighContrast/icon-theme.cache
}
preFixupPhases="$preFixupPhases hicolorPreFixupPhase"
addEnvHooks "${hostOffset:?}" hicolorIconThemeHook
pkgs/data/icons/iconpack-obsidian/default.nix
+7 -1
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, gtk3 }:
{ stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }:
stdenv.mkDerivation rec {
pname = "iconpack-obsidian";
@@ -13,6 +13,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ gtk3 ];
propagatedBuildInputs = [
hicolor-icon-theme
];
dontDropIconThemeCache = true;
installPhase = ''
mkdir -p $out/share/icons
mv Obsidian* $out/share/icons
pkgs/data/icons/maia-icon-theme/default.nix
+3 -1
View File
@@ -21,10 +21,12 @@ stdenv.mkDerivation {
kdeFrameworks.kwindowsystem
];
buildInputs = [
propagatedBuildInputs = [
hicolor-icon-theme
];
dontDropIconThemeCache = true;
postFixup = ''
for theme in $out/share/icons/*; do
gtk-update-icon-cache $theme
pkgs/data/icons/moka-icon-theme/default.nix
+7 -1
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, faba-icon-theme }:
{ stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, faba-icon-theme, hicolor-icon-theme }:
stdenv.mkDerivation rec {
pname = "moka-icon-theme";
@@ -13,6 +13,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja gtk3 python3 faba-icon-theme ];
propagatedBuildInputs = [
hicolor-icon-theme
];
dontDropIconThemeCache = true;
postPatch = ''
patchShebangs meson/post_install.py
'';
pkgs/data/icons/numix-icon-theme-circle/default.nix
+7 -1
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, gtk3, numix-icon-theme }:
{ stdenv, fetchFromGitHub, gtk3, numix-icon-theme, hicolor-icon-theme }:
stdenv.mkDerivation rec {
pname = "numix-icon-theme-circle";
@@ -13,6 +13,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ gtk3 numix-icon-theme ];
propagatedBuildInputs = [
hicolor-icon-theme
];
dontDropIconThemeCache = true;
installPhase = ''
install -dm 755 $out/share/icons
cp -dr --no-preserve='ownership' Numix-Circle{,-Light} $out/share/icons/
pkgs/data/icons/numix-icon-theme-square/default.nix
+7 -1
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, gtk3, numix-icon-theme }:
{ stdenv, fetchFromGitHub, gtk3, numix-icon-theme, hicolor-icon-theme }:
stdenv.mkDerivation rec {
pname = "numix-icon-theme-square";
@@ -13,6 +13,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ gtk3 numix-icon-theme ];
propagatedBuildInputs = [
hicolor-icon-theme
];
dontDropIconThemeCache = true;
installPhase = ''
mkdir -p $out/share/icons
cp -a Numix-Square{,-Light} $out/share/icons/
pkgs/data/icons/numix-icon-theme/default.nix
+7 -1
View File
@@ -11,7 +11,13 @@ stdenv.mkDerivation rec {
sha256 = "0clh55kmhc52d33dfm2c6h3lg6ddfh8a088ir9lv1camn9kj55bd";
};
nativeBuildInputs = [ gtk3 hicolor-icon-theme ];
nativeBuildInputs = [ gtk3 ];
propagatedBuildInputs = [
hicolor-icon-theme
];
dontDropIconThemeCache = true;
installPhase = ''
mkdir -p $out/share/icons
pkgs/data/icons/paper-icon-theme/default.nix
+7 -1
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, meson, ninja, gtk3, python3 }:
{ stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, hicolor-icon-theme }:
stdenv.mkDerivation rec {
pname = "paper-icon-theme";
@@ -13,6 +13,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja gtk3 python3 ];
propagatedBuildInputs = [
hicolor-icon-theme
];
dontDropIconThemeCache = true;
postPatch = ''
patchShebangs meson/post_install.py
'';
pkgs/data/icons/papirus-icon-theme/default.nix
+7 -1
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, gtk3 }:
{ stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }:
stdenv.mkDerivation rec {
pname = "papirus-icon-theme";
@@ -13,6 +13,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ gtk3 ];
propagatedBuildInputs = [
hicolor-icon-theme
];
dontDropIconThemeCache = true;
installPhase = ''
mkdir -p $out/share/icons
mv {,e}Papirus* $out/share/icons
pkgs/data/icons/tango-icon-theme/default.nix
+7 -1
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, intltool, pkgconfig, iconnamingutils, imagemagick, librsvg
, gtk/*any version*/
, gtk/*any version*/, hicolor-icon-theme
}:
stdenv.mkDerivation rec {
@@ -15,6 +15,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool iconnamingutils imagemagick librsvg ];
propagatedBuildInputs = [
hicolor-icon-theme
];
dontDropIconThemeCache = true;
configureFlags = [ "--enable-png-creation" ];
postInstall = '''${gtk.out}/bin/gtk-update-icon-cache' "$out/share/icons/Tango" '';
pkgs/data/icons/vanilla-dmz/default.nix
+5 -1
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchzip, xorg }:
{ stdenv, lib, fetchzip, xorg, hicolor-icon-theme }:
stdenv.mkDerivation rec {
pname = "vanilla-dmz";
@@ -8,6 +8,10 @@ stdenv.mkDerivation rec {
sha256 = "1l0c0svk7dy0d7icg7j2181wdn3fvks5gmyqnvjk749ppy5ks8mj";
};
buildInputs = [ xorg.xcursorgen ];
propagatedBuildInputs = [
hicolor-icon-theme
];
dontDropIconThemeCache = true;
buildPhase = ''
cd DMZ-White/pngs; ./make.sh; cd -
cd DMZ-Black/pngs; ./make.sh; cd -
pkgs/data/icons/zafiro-icons/default.nix
+7 -1
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, gtk3 }:
{ stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }:
stdenv.mkDerivation rec {
pname = "zafiro-icons";
@@ -13,6 +13,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ gtk3 ];
propagatedBuildInputs = [
hicolor-icon-theme
];
dontDropIconThemeCache = true;
installPhase = ''
mkdir -p $out/share/icons/Zafiro-icons
cp -a * $out/share/icons/Zafiro-icons
pkgs/data/misc/cacert/setup-hook.sh
+3 -7
View File
@@ -1,7 +1,3 @@
cacertHook() {
export NIX_SSL_CERT_FILE=@out@/etc/ssl/certs/ca-bundle.crt
# left for compatibility
export SSL_CERT_FILE=@out@/etc/ssl/certs/ca-bundle.crt
}
addEnvHooks "$targetOffset" cacertHook
export NIX_SSL_CERT_FILE=@out@/etc/ssl/certs/ca-bundle.crt
# left for compatibility
export SSL_CERT_FILE=@out@/etc/ssl/certs/ca-bundle.crt
pkgs/data/misc/shared-mime-info/default.nix
+25 -10
View File
@@ -1,21 +1,36 @@
{stdenv, fetchurl, pkgconfig, gettext, perlPackages, intltool
, libxml2, glib}:
{ stdenv
, fetchurl
, pkgconfig
, gettext
, perlPackages
, itstool
, libxml2
, glib
}:
let version = "1.12"; in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "shared-mime-info";
inherit version;
version = "1.13.1";
src = fetchurl {
url = "https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/80c7f1afbcad2769f38aeb9ba6317a51/shared-mime-info-1.12.tar.xz";
sha256 = "0gj0pp36qpsr9w6v4nywnjpcisadwkndapqsjn0ny3gd0zzg1chq";
url = "https://gitlab.freedesktop.org/xdg/${pname}/uploads/5349e18c86eb96eee258a5c1f19122d0/${pname}-${version}.tar.xz";
sha256 = "1bic8z5nz08qxv1x6zlxnx2j4cmlzm12kygrn3rrh1djqxdhma3f";
};
nativeBuildInputs = [ pkgconfig gettext intltool ] ++ (with perlPackages; [ perl XMLParser ]);
buildInputs = [ libxml2 glib ];
nativeBuildInputs = [
pkgconfig
gettext
itstool
] ++ (with perlPackages; [
perl XMLParser
]);
buildInputs = [
libxml2
glib
];
meta = with stdenv.lib; {
inherit version;
description = "A database of common MIME types";
homepage = http://freedesktop.org/wiki/Software/shared-mime-info;
license = licenses.gpl2Plus;