diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2022-12-15 01:42:53 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2023-05-18 18:11:19 +0200 |
| commit | a771af8900ebcbb50a6f80933e6077208c23c3a4 (patch) | |
| tree | e5c068ebb9b81f4b55d3fa2d9cc33fc33dd5ca29 | |
| parent | 8bf196796456cc9e7b6685d74741bf2cf305234c (diff) | |
ashpd-demo: 0.2.2 → 0.3.0
https://github.com/bilelmoussaoui/ashpd/compare/0.2.2...0.3.0-demo Remove update script since it cannot deal with monorepo tags (we only want tags with -demo suffix).
| -rw-r--r-- | pkgs/development/tools/ashpd-demo/default.nix | 37 |
1 files changed, 14 insertions, 23 deletions
diff --git a/pkgs/development/tools/ashpd-demo/default.nix b/pkgs/development/tools/ashpd-demo/default.nix index c489eddd11745..6c64a8cda4bdb 100644 --- a/pkgs/development/tools/ashpd-demo/default.nix +++ b/pkgs/development/tools/ashpd-demo/default.nix @@ -21,25 +21,20 @@ , desktop-file-utils }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ashpd-demo"; - version = "0.2.2"; + version = "0.3.0"; - src = - let - share = fetchFromGitHub { - owner = "bilelmoussaoui"; - repo = "ashpd"; - rev = version; - sha256 = "9O6XqM4oys/hXgztQQ8tTobJV8U52db/VY6FlTMUvGY="; - }; - in - "${share}/ashpd-demo"; + src = fetchFromGitHub { + owner = "bilelmoussaoui"; + repo = "ashpd"; + rev = "${finalAttrs.version}-demo"; + hash = "sha256-isc0+Mke6XeCCLiuxnjHqrnlGqYuQnmcU1acM14UOno="; + }; cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - name = "${pname}-${version}"; - hash = "sha256-eFq42m16zzrUBbAqv7BsAf4VxyO93WynLjvIzKbZwnQ="; + src = "${finalAttrs.src}/ashpd-demo"; + hash = "sha256-9L/WFL2fLCRahjGCVdgV+3HfDMrntdIWcuuOJbzdPiI="; }; nativeBuildInputs = [ @@ -66,13 +61,9 @@ stdenv.mkDerivation rec { libshumate ]; - # FIXME: workaround for Pipewire 0.3.64 deprecated API change, remove when fixed upstream - # https://gitlab.freedesktop.org/pipewire/pipewire-rs/-/issues/55 - env.NIX_CFLAGS_COMPILE = toString [ "-DPW_ENABLE_DEPRECATED" ]; - - passthru = { - updateScript = nix-update-script { }; - }; + postPatch = '' + cd ashpd-demo + ''; meta = with lib; { description = "Tool for playing with XDG desktop portals"; @@ -81,4 +72,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; }; -} +}) |