Unverified Commit 400ca1e2 authored by isabel's avatar isabel Committed by GitHub
Browse files

mpvScripts.{modernx,modernx-zydezu,modernz,mpv-osc-modern}: use installFonts (#495852)

parents e4557f50 7448ad53

pkgs/by-name/mp/mpv/scripts/modernx-zydezu.nix

+3 −4
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
  lib,

  buildLua,

  fetchFromGitHub,

  installFonts,

  makeFontsConf,

  nix-update-script,

}:
@@ -17,10 +18,8 @@ buildLua (finalAttrs: { 
    hash = "sha256-a+StfEYQwt5NuELvanvZllrD2RQ0g9JBpCznMdSDM5Y=";

  };



  postInstall = ''

    mkdir -p $out/share/fonts

    cp -r *.ttf $out/share/fonts

  '';

  nativeBuildInputs = [ installFonts ];



  passthru.extraWrapperArgs = [

    "--set"

    "FONTCONFIG_FILE"

pkgs/by-name/mp/mpv/scripts/modernx.nix

+3 −4
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
  lib,

  buildLua,

  fetchFromGitHub,

  installFonts,

  makeFontsConf,

  nix-update-script,

}:
@@ -17,10 +18,8 @@ buildLua (finalAttrs: { 
    hash = "sha256-q7DwyfmOIM7K1L7vvCpq1EM0RVpt9E/drhAa9rLYb1k=";

  };



  postInstall = ''

    mkdir -p $out/share/fonts

    cp -r *.ttf $out/share/fonts

  '';

  nativeBuildInputs = [ installFonts ];



  passthru.extraWrapperArgs = [

    "--set"

    "FONTCONFIG_FILE"

pkgs/by-name/mp/mpv/scripts/modernz.nix

+2 −3
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
  lib,

  buildLua,

  fetchFromGitHub,

  installFonts,

  makeFontsConf,

  nix-update-script,

}:
@@ -17,9 +18,7 @@ buildLua (finalAttrs: { 
    hash = "sha256-9jth8TCAx/cmbAfO8s+1WPpMDuF79gQtVlC4OG2adrA=";

  };



  postInstall = ''

    install -Dt $out/share/fonts *.ttf

  '';

  nativeBuildInputs = [ installFonts ];



  passthru.extraWrapperArgs = [

    "--set"

pkgs/by-name/mp/mpv/scripts/mpv-osc-modern.nix

+3 −4
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
  lib,

  buildLua,

  fetchFromGitHub,

  installFonts,

  makeFontsConf,

  nix-update-script,

}:
@@ -17,10 +18,8 @@ buildLua (finalAttrs: { 
    hash = "sha256-RMUy8UpSRSCEPAbnGLpJ2NjDsDdkjq8cNsdGwsQ5ANU=";

  };



  postInstall = ''

    mkdir -p $out/share/fonts

    cp -r *.ttf $out/share/fonts

  '';

  nativeBuildInputs = [ installFonts ];



  passthru.extraWrapperArgs = [

    "--set"

    "FONTCONFIG_FILE"