summary refs log tree commit diff
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2022-01-27 20:27:22 +0800
committerBobby Rong <rjl931189261@126.com>2022-01-27 21:15:09 +0800
commita56682b80e51912c0c0b35e1efdb90c1725d2b47 (patch)
treef490027723d17c4c3c86fa6d13a1940ed587375e
parentee68e7a2a9c8cc97aae3a5e16b7b3ad5bb273a50 (diff)
downloadnixpkgs-a56682b80e51912c0c0b35e1efdb90c1725d2b47.tar
nixpkgs-a56682b80e51912c0c0b35e1efdb90c1725d2b47.tar.gz
nixpkgs-a56682b80e51912c0c0b35e1efdb90c1725d2b47.tar.bz2
nixpkgs-a56682b80e51912c0c0b35e1efdb90c1725d2b47.tar.lz
nixpkgs-a56682b80e51912c0c0b35e1efdb90c1725d2b47.tar.xz
nixpkgs-a56682b80e51912c0c0b35e1efdb90c1725d2b47.tar.zst
nixpkgs-a56682b80e51912c0c0b35e1efdb90c1725d2b47.zip
ashpd-demo: 0.0.1-alpha → 0.2.2
https://github.com/bilelmoussaoui/ashpd/releases/tag/0.2.0
https://github.com/bilelmoussaoui/ashpd/releases/tag/0.2.1
https://github.com/bilelmoussaoui/ashpd/releases/tag/0.2.2
-rw-r--r--pkgs/development/tools/ashpd-demo/default.nix16
1 files changed, 3 insertions, 13 deletions
diff --git a/pkgs/development/tools/ashpd-demo/default.nix b/pkgs/development/tools/ashpd-demo/default.nix
index a52a6ca8179..f6842dacec9 100644
--- a/pkgs/development/tools/ashpd-demo/default.nix
+++ b/pkgs/development/tools/ashpd-demo/default.nix
@@ -4,7 +4,6 @@
 , nix-update-script
 , meson
 , ninja
-, python3
 , rustPlatform
 , pkg-config
 , glib
@@ -22,7 +21,7 @@
 
 stdenv.mkDerivation rec {
   pname = "ashpd-demo";
-  version = "0.0.1-alpha";
+  version = "0.2.2";
 
   src =
     let
@@ -30,7 +29,7 @@ stdenv.mkDerivation rec {
         owner = "bilelmoussaoui";
         repo = "ashpd";
         rev = version;
-        sha256 = "Lf3Wj4VTDyJ5a1bJTEI6R6aaeEHZ+4hO+BsD98sKb/s=";
+        sha256 = "9O6XqM4oys/hXgztQQ8tTobJV8U52db/VY6FlTMUvGY=";
       };
     in
     "${share}/ashpd-demo";
@@ -38,14 +37,13 @@ stdenv.mkDerivation rec {
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
     name = "${pname}-${version}";
-    hash = "sha256-npqC8lu7acAggJyR4iDkcQZYMNNnseV2pB3+j4G/nIk=";
+    hash = "sha256-eFq42m16zzrUBbAqv7BsAf4VxyO93WynLjvIzKbZwnQ=";
   };
 
   nativeBuildInputs = [
     meson
     ninja
     pkg-config
-    python3
     rustPlatform.rust.cargo
     rustPlatform.cargoSetupHook
     rustPlatform.rust.rustc
@@ -70,13 +68,6 @@ stdenv.mkDerivation rec {
   # <spa-0.2/spa/utils/defs.h> included by libspa-sys requires <stdbool.h>
   BINDGEN_EXTRA_CLANG_ARGS = "-I${llvmPackages.libclang.lib}/lib/clang/${lib.getVersion llvmPackages.clang}/include -I${glibc.dev}/include";
 
-  postPatch = ''
-    patchShebangs build-aux/meson_post_install.py
-    # https://github.com/bilelmoussaoui/ashpd/pull/32
-    substituteInPlace build-aux/meson_post_install.py \
-      --replace "gtk-update-icon-cache" "gtk4-update-icon-cache"
-  '';
-
   passthru = {
     updateScript = nix-update-script {
       attrPath = pname;
@@ -86,7 +77,6 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Tool for playing with XDG desktop portals";
     homepage = "https://github.com/bilelmoussaoui/ashpd/tree/master/ashpd-demo";
-    broken = true; # requires older libadwaita
     license = licenses.mit;
     maintainers = with maintainers; [ jtojnar ];
     platforms = platforms.linux;