Merge pull request #56552 from worldofpeace/elementary-screenshot-tool/fix-conceal-text

pantheon.elementary-screenshot-tool: fix conceal text

2 files changed, 0 insertions, 39 deletions

diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix
index f1c07b8d3f5..2644d31d798 100644
--- a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix
@@ -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";
@@ -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;
diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/redacted-script.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/redacted-script.nix
deleted file mode 100644
index db1d9d240c4..00000000000
--- a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/redacted-script.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchFromGitHub, pantheon }:
-
-stdenv.mkDerivation rec {
-  name = "elementary-redacted-script-${version}";
-  version = "5.1.0";
-
-  src = fetchFromGitHub {
-    owner = "elementary";
-    repo = "fonts";
-    rev = version;
-    sha256 = "16x2w7w29k4jx2nwc5932h9rqvb216vxsziazisv2rpll74kn8b2";
-  };
-
-  dontConfigure = true;
-
-  installPhase = ''
-    mkdir -p $out/share/fonts/truetype/redacted-elementary
-    cp -a redacted/*.ttf $out/share/fonts/truetype/redacted-elementary
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Redacted Script Font for elementary";
-    homepage = https://github.com/elementary/fonts;
-    license = licenses.ofl;
-    maintainers = pantheon.maintainers;
-    platforms = platforms.linux;
-  };
-}