diff options
| author | José Romildo Malaquias <malaquias@gmail.com> | 2020-04-21 10:29:12 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-21 10:29:12 -0300 |
| commit | adcb685ec0640d1fe22dda47ad13b00eca94f33f (patch) | |
| tree | 1e523cbe2dab1348f2d4549f251e9c2520341a91 /pkgs/data | |
| parent | 4d92e1b32d6abf62b2eb97a8df2ad682daead525 (diff) | |
| parent | cf1a68360e934565da1cd9e15a5d7bf7c7a246e7 (diff) | |
| download | nixpkgs-adcb685ec0640d1fe22dda47ad13b00eca94f33f.tar nixpkgs-adcb685ec0640d1fe22dda47ad13b00eca94f33f.tar.gz nixpkgs-adcb685ec0640d1fe22dda47ad13b00eca94f33f.tar.bz2 nixpkgs-adcb685ec0640d1fe22dda47ad13b00eca94f33f.tar.lz nixpkgs-adcb685ec0640d1fe22dda47ad13b00eca94f33f.tar.xz nixpkgs-adcb685ec0640d1fe22dda47ad13b00eca94f33f.tar.zst nixpkgs-adcb685ec0640d1fe22dda47ad13b00eca94f33f.zip | |
Merge branch 'staging' into fix.icon-theme-inheritance
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/icons/hicolor-icon-theme/setup-hook.sh | 3 | ||||
| -rw-r--r-- | pkgs/data/themes/arc/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/data/themes/yaru/default.nix | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh b/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh index 9a6b5f405ca..0fd9bf85d83 100644 --- a/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh +++ b/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh @@ -10,8 +10,7 @@ hicolorIconThemeHook() { } # I think this is meant to be a runtime dep -addEnvHooks "${hostOffset:?}" hicolorIconThemeHook - +addEnvHooks "${targetOffset:?}" hicolorIconThemeHook # Make symbolic links of parent icon themes that are inherited in the # icon themes installed by the package. diff --git a/pkgs/data/themes/arc/default.nix b/pkgs/data/themes/arc/default.nix index c08d4c57786..53e81b323dc 100644 --- a/pkgs/data/themes/arc/default.nix +++ b/pkgs/data/themes/arc/default.nix @@ -48,5 +48,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ simonvandel romildo ]; platforms = platforms.linux; + broken = true; # since libsass 3.6.3 }; } diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/data/themes/yaru/default.nix index bc9e4de5a67..a14dbbf61bc 100644 --- a/pkgs/data/themes/yaru/default.nix +++ b/pkgs/data/themes/yaru/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { license = with licenses; [ cc-by-sa-40 gpl3 ]; platforms = platforms.linux; maintainers = [ maintainers.jD91mZM2 ]; + broken = true; # since libsass 3.6.3 }; } |