diff options
-rw-r--r-- | pkgs/applications/video/mpv/scripts/convert.nix | 12 | ||||
-rw-r--r-- | pkgs/applications/video/mpv/scripts/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/kotlin/native.nix | 4 |
3 files changed, 6 insertions, 12 deletions
diff --git a/pkgs/applications/video/mpv/scripts/convert.nix b/pkgs/applications/video/mpv/scripts/convert.nix index 40a1050cd32..4f90b0c62ed 100644 --- a/pkgs/applications/video/mpv/scripts/convert.nix +++ b/pkgs/applications/video/mpv/scripts/convert.nix @@ -1,7 +1,7 @@ -{ stdenvNoCC, fetchgit, lib +{ lib, fetchgit, buildLua , yad, mkvtoolnix-cli, libnotify }: -stdenvNoCC.mkDerivation { +buildLua { pname = "mpv-convert-script"; version = "2016-03-18"; src = fetchgit { @@ -22,15 +22,9 @@ stdenvNoCC.mkDerivation { 'yad_exe = "${yad}/bin/yad"' \ --replace 'notify_send_exe = "notify-send"' \ 'notify_send_exe = "${libnotify}/bin/notify-send"' \ - ''; - dontBuild = true; - installPhase = '' - mkdir -p $out/share/mpv/scripts - cp convert_script.lua $out/share/mpv/scripts - ''; - passthru.scriptName = "convert_script.lua"; + scriptPath = "convert_script.lua"; meta = with lib; { description = "Convert parts of a video while you are watching it in mpv"; diff --git a/pkgs/applications/video/mpv/scripts/default.nix b/pkgs/applications/video/mpv/scripts/default.nix index 94c59fa8b06..cdc641043f3 100644 --- a/pkgs/applications/video/mpv/scripts/default.nix +++ b/pkgs/applications/video/mpv/scripts/default.nix @@ -11,7 +11,7 @@ in lib.recurseIntoAttrs autodeint = callPackage ./autodeint.nix { }; autoload = callPackage ./autoload.nix { }; chapterskip = callPackage ./chapterskip.nix { inherit buildLua; }; - convert = callPackage ./convert.nix { }; + convert = callPackage ./convert.nix { inherit buildLua; }; inhibit-gnome = callPackage ./inhibit-gnome.nix { }; mpris = callPackage ./mpris.nix { }; mpv-playlistmanager = callPackage ./mpv-playlistmanager.nix { inherit buildLua; }; diff --git a/pkgs/development/compilers/kotlin/native.nix b/pkgs/development/compilers/kotlin/native.nix index 4f6dddb3fa1..b50f6287c97 100644 --- a/pkgs/development/compilers/kotlin/native.nix +++ b/pkgs/development/compilers/kotlin/native.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "kotlin-native"; - version = "1.9.10"; + version = "1.9.20"; src = let getArch = { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { getHash = arch: { "macos-aarch64" = "1pn371hy6hkyji4vkfiw3zw30wy0yyfhkxnkkyr8m0609945mkyj"; "macos-x86_64" = "13c28czvja93zaff0kzqf8crzh998l90gznq0cl6k2j3c0jhyrgm"; - "linux-x86_64" = "0nxaiwn4akfpkibq42y8kfn5hdd7vzkm296qx4a9ai7l36cngcqx"; + "linux-x86_64" = "sha256-faMuBYUG5qj0N4vg5EcfWIC3UjXiPhFJuikzXVgNsjw="; }.${arch}; in fetchurl { |