Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

pantheon.elementary-screenshot-tool: fix conceal text #56552

Merged
merged 2 commits into from
Mar 9, 2019
Merged

pantheon.elementary-screenshot-tool: fix conceal text #56552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86f4bad
pantheon.elementary-redacted-script: init at 2016-06-03
worldofpeace Feb 28, 2019
59f4708
nixos/pantheon: add elementary-redacted-script to fonts
worldofpeace Feb 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions nixos/modules/services/x11/desktop-managers/pantheon.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ in
fonts.fonts = with pkgs; [
opensans-ttf
roboto-mono
pantheon.elementary-redacted-script # needed by screenshot-tool
];
fonts.fontconfig.defaultFonts = {
monospace = [ "Roboto Mono" ];
Expand Down
11 changes: 0 additions & 11 deletions pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@
, ninja, vala, python3, desktop-file-utils, gtk3, granite, libgee
, libcanberra, gobject-introspection, elementary-icon-theme, wrapGAppsHook }:

let

redacted-script = callPackage ./redacted-script.nix {};

in

stdenv.mkDerivation rec {
pname = "screenshot-tool"; # This will be renamed to "screenshot" soon. See -> https://github.com/elementary/screenshot/pull/93
version = "1.6.2";
Expand Down Expand Up @@ -52,11 +46,6 @@ stdenv.mkDerivation rec {
patchShebangs meson/post_install.py
'';

postInstall = ''
mkdir -p $out/share/fonts/truetype
cp -rva ${redacted-script}/share/fonts/truetype/redacted-elementary $out/share/fonts/truetype
'';

meta = with stdenv.lib; {
description = "Screenshot tool designed for elementary OS";
homepage = https://github.com/elementary/screenshot;
Expand Down
28 changes: 0 additions & 28 deletions pkgs/desktops/pantheon/apps/elementary-screenshot-tool/redacted-script.nix
View file
Open in desktop

This file was deleted.

28 changes: 28 additions & 0 deletions pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{ stdenv, fetchFromGitHub, pantheon }:

stdenv.mkDerivation rec {
pname = "elementary-redacted-script";
version = "unstable-2016-06-03";

src = fetchFromGitHub {
owner = "png2378";
repo = "redacted-elementary";
rev = "346440ff9ce19465e6d5c3d6d67a8573f992c746";
sha256 = "1jpd13sxkarclr0mlm66wzgpjh52ghzjzn4mywhyshyyskwn7jg1";
};

dontBuild = true;

installPhase = ''
mkdir -p $out/share/fonts/truetype/redacted-elementary
cp -a truetype/*.ttf $out/share/fonts/truetype/redacted-elementary
'';

meta = with stdenv.lib; {
description = "Font for concealing text";
homepage = https://github.com/png2378/redacted-elementary;
license = licenses.ofl;
maintainers = pantheon.maintainers;
platforms = platforms.linux;
};
}
2 changes: 2 additions & 0 deletions pkgs/desktops/pantheon/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,8 @@ lib.makeScope pkgs.newScope (self: with self; {

elementary-icon-theme = callPackage ./artwork/elementary-icon-theme { };

elementary-redacted-script = callPackage ./artwork/elementary-redacted-script { };

elementary-sound-theme = callPackage ./artwork/elementary-sound-theme { };

elementary-wallpapers = callPackage ./artwork/elementary-wallpapers { };
Expand Down