aboutsummaryrefslogtreecommitdiff
path: root/pkgs/default.nix
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2026-09-23 08:09:45 +0200
committerKarel Kočí <cynerd@email.cz>2026-09-23 08:09:45 +0200
commitc42de3037ec406fa834c6c1756a6f0b70dcdd38f (patch)
tree0d195492fc3f24c9742567f5bff8c157ec72baa0 /pkgs/default.nix
parentb0af9c76e1687f2afad15ba7a0de1d24331868c8 (diff)
downloadnixos-personal-c42de3037ec406fa834c6c1756a6f0b70dcdd38f.tar.gz
nixos-personal-c42de3037ec406fa834c6c1756a6f0b70dcdd38f.tar.bz2
nixos-personal-c42de3037ec406fa834c6c1756a6f0b70dcdd38f.zip
treewise: cleanup and general updateHEADmaster
Diffstat (limited to 'pkgs/default.nix')
-rw-r--r--pkgs/default.nix47
1 files changed, 23 insertions, 24 deletions
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 376a9d8..cb4f913 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -87,30 +87,29 @@ final: prev: {
};
# NixPkgs patches
- gnutls =
- if prev.stdenv.hostPlatform != prev.stdenv.buildPlatform
- then
- prev.gnutls.overrideAttrs (oldAttrs: {
- configureFlags = oldAttrs.configureFlags ++ ["--disable-doc"];
- outputs = builtins.filter (v: v != "man" && v != "devdoc") oldAttrs.outputs;
- })
- else prev.gnutls;
- git =
- if prev.stdenv.hostPlatform != prev.stdenv.buildPlatform
- then prev.git.override {rustSupport = false;}
- else prev.git;
- libcap =
- if prev.stdenv.hostPlatform != prev.stdenv.buildPlatform
- then
- prev.libcap.overrideAttrs {
- patches = [
- (final.fetchpatch {
- url = "https://git.kernel.org/pub/scm/libs/libcap/libcap.git/patch/?id=d628b3bfe40338d4efff6b0ae50f250a0eb884c7";
- hash = "sha256-Eiv/BOJZkduL+hOEJd8K1LQd9wvOeCKchE2GaLcerVc=";
- })
- ];
- }
- else prev.libcap;
+ xdg-desktop-portal = prev.xdg-desktop-portal.overrideAttrs (oldAttrs: {
+ patches =
+ oldAttrs.patches
+ ++ [
+ # https://github.com/NixOS/nixpkgs/pull/548762
+ (final.fetchpatch {
+ url = "https://github.com/NixOS/nixpkgs/raw/4ba561388760a6fdfe376cbef28613b4366161ab/pkgs/by-name/xd/xdg-desktop-portal/allow-no-graphical-session-target.patch";
+ hash = "sha256-55RFYk4Fzsj8xp6j0wg1AEz+9c05tqfNkPCP+z9czdI=";
+ })
+ ];
+ });
+ #gnutls =
+ # if prev.stdenv.hostPlatform != prev.stdenv.buildPlatform
+ # then
+ # prev.gnutls.overrideAttrs (oldAttrs: {
+ # configureFlags = oldAttrs.configureFlags ++ ["--disable-doc"];
+ # outputs = builtins.filter (v: v != "man" && v != "devdoc") oldAttrs.outputs;
+ # })
+ # else prev.gnutls;
+ #git =
+ # if prev.stdenv.hostPlatform != prev.stdenv.buildPlatform
+ # then prev.git.override {rustSupport = false;}
+ # else prev.git;
gvproxy =
if prev.stdenv.hostPlatform.is32bit
then