From cda85c65be8c493e0bd37e5af9cd5c673a53a165 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Tue, 11 Jun 2024 19:29:03 -0400
Subject: [PATCH] flatpak: modernize

https://github.com/NixOS/nixpkgs/issues/208242
---
 pkgs/by-name/fl/flatpak/package.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/fl/flatpak/package.nix b/pkgs/by-name/fl/flatpak/package.nix
index af3982c60bf6..50b8dcc592c4 100644
--- a/pkgs/by-name/fl/flatpak/package.nix
+++ b/pkgs/by-name/fl/flatpak/package.nix
@@ -51,7 +51,6 @@
   dconf,
   gsettings-desktop-schemas,
   librsvg,
-  makeWrapper,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -70,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://github.com/flatpak/flatpak/releases/download/${finalAttrs.version}/flatpak-${finalAttrs.version}.tar.xz";
-    sha256 = "sha256-U482ssb4xw7v0S0TrVsa2DCCAQaovTqfa45NnegeSUY="; # Taken from https://github.com/flatpak/flatpak/releases/
+    hash = "sha256-U482ssb4xw7v0S0TrVsa2DCCAQaovTqfa45NnegeSUY=";
   };
 
   patches = [
@@ -174,8 +173,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   configureFlags = [
     "--with-curl"
-    "--with-system-bubblewrap=${bubblewrap}/bin/bwrap"
-    "--with-system-dbus-proxy=${xdg-dbus-proxy}/bin/xdg-dbus-proxy"
+    "--with-system-bubblewrap=${lib.getExe bubblewrap}"
+    "--with-system-dbus-proxy=${lib.getExe xdg-dbus-proxy}"
     "--with-dbus-config-dir=${placeholder "out"}/share/dbus-1/system.d"
     "--with-profile-dir=${placeholder "out"}/etc/profile.d"
     "--localstatedir=/var"
@@ -215,11 +214,12 @@ stdenv.mkDerivation (finalAttrs: {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Linux application sandboxing and distribution framework";
     homepage = "https://flatpak.org/";
-    license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ getchoo ];
-    platforms = platforms.linux;
+    changelog = "https://github.com/flatpak/flatpak/releases/tag/${finalAttrs.version}";
+    license = lib.licenses.lgpl21Plus;
+    maintainers = with lib.maintainers; [ getchoo ];
+    platforms = lib.platforms.linux;
   };
 })