nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-06 20:23:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #207321 from wegank/xorgcffiles-aarch64-darwin

Browse Source
This commit is contained in:
Sandro 2023-01-01 02:53:04 +01:00 committed by GitHub
commit af7bf7507f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/misc/oneko/default.nix
View File

@ -35,7 +35,5 @@ stdenv.mkDerivation rec {
license = with licenses; [ publicDomain ];
maintainers = with maintainers; [ xaverdh irenes ];
platforms = platforms.unix;
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

2
pkgs/applications/science/astronomy/xearth/default.nix
View File

@ -26,8 +26,6 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.mafo ];
license = "xearth";
platforms=platforms.unix;
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

2
pkgs/games/xskat/default.nix
View File

@ -26,7 +26,5 @@ stdenv.mkDerivation rec {
license = licenses.free;
longDescription = "Play the german card game Skat against the AI or over IRC.";
homepage = "http://www.xskat.de/";
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

2
pkgs/games/xsok/default.nix
View File

@ -42,7 +42,5 @@ stdenv.mkDerivation rec {
maintainers = [lib.maintainers.raskin];
platforms = lib.platforms.unix;
homepage = "https://tracker.debian.org/pkg/xsok";
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

7
pkgs/servers/x11/xorg/overrides.nix
View File

@ -1067,6 +1067,13 @@ self: super:
});
xorgcffiles = super.xorgcffiles.overrideAttrs (attrs: {
patches = [
(fetchpatch {
name = "add-aarch64-darwin-support.patch";
url = "https://gitlab.freedesktop.org/xorg/util/cf/-/commit/8d88c559b177e832b581c8ac0aa383b6cf79e0d0.patch";
sha256 = "sha256-wCijdmlUtVgOh9Rp/LJrg1ObYm4OPTke5Xwu0xC0ap4=";
})
];
postInstall = lib.optionalString stdenv.isDarwin ''
substituteInPlace $out/lib/X11/config/darwin.cf --replace "/usr/bin/" ""
'';

2
pkgs/tools/networking/x11-ssh-askpass/default.nix
View File

@ -30,7 +30,5 @@ stdenv.mkDerivation rec {
description = "Lightweight passphrase dialog for OpenSSH or other open variants of SSH";
license = licenses.mit;
platforms = platforms.unix;
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}