diff --git a/flake.lock b/flake.lock index 99953e9..8724dc9 100644 --- a/flake.lock +++ b/flake.lock @@ -17,11 +17,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1648632716, - "narHash": "sha256-kCmnDeiaMsdhfnNKjxdOzwRh2H6eQb8yWAL+nNabC/Y=", + "lastModified": 1649225869, + "narHash": "sha256-u1zLtPmQzhT9mNXyM8Ey9pk7orDrIKdwooeGDEXm5xM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "710fed5a2483f945b14f4a58af2cd3676b42d8c8", + "rev": "b6966d911da89e5a7301aaef8b4f0a44c77e103c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 382715c..47a420b 100644 --- a/flake.nix +++ b/flake.nix @@ -15,7 +15,7 @@ channels.nixpkgs.input = nixpkgs; - channels.nixpkgs.patches = [ ./gcr-wrapgapps.patch ]; + channels.nixpkgs.patches = [ ]; nix.generateRegistryFromInputs = true; diff --git a/gcr-wrapgapps.patch b/gcr-wrapgapps.patch deleted file mode 100644 index 15c0a23..0000000 --- a/gcr-wrapgapps.patch +++ /dev/null @@ -1,42 +0,0 @@ -commit d8d3deb8d91c01892f70e7e5ab7fdf182ab6d71d -Author: Gabriel Ebner -Date: Sat Apr 2 12:59:35 2022 +0200 - - gcr: use wrapGAppsHook - - The manual wrapProgram invocation missed binaries in libexec. - -diff --git a/pkgs/development/libraries/gcr/default.nix b/pkgs/development/libraries/gcr/default.nix -index b277a52a658..6c1c3de08a2 100644 ---- a/pkgs/development/libraries/gcr/default.nix -+++ b/pkgs/development/libraries/gcr/default.nix -@@ -16,7 +16,7 @@ - , openssh - , systemd - , gobject-introspection --, makeWrapper -+, wrapGAppsHook - , libxslt - , vala - , gnome -@@ -53,7 +53,7 @@ stdenv.mkDerivation rec { - gettext - gobject-introspection - libxslt -- makeWrapper -+ wrapGAppsHook - vala - shared-mime-info - ]; -@@ -96,11 +96,6 @@ stdenv.mkDerivation rec { - patchShebangs meson_post_install.py - ''; - -- preFixup = '' -- wrapProgram "$out/bin/gcr-viewer" \ -- --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" -- ''; -- - passthru = { - updateScript = gnome.updateScript { - packageName = pname;