diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-04-22 22:31:30 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-04-22 22:31:30 +0300 |
| commit | 3c6e077301146c221c3780afb66d93523fbebd27 (patch) | |
| tree | e3f1b18251e151298e15fa0727c0bd42695aec93 /pkgs/servers/x11/xorg | |
| parent | c70a245bb314250271c0fa1b6bcc78f80f867dfe (diff) | |
| parent | 6a819c8f8c9100eb1a79515f10ad2d0d49b42ed5 (diff) | |
| download | nixlib-3c6e077301146c221c3780afb66d93523fbebd27.tar nixlib-3c6e077301146c221c3780afb66d93523fbebd27.tar.gz nixlib-3c6e077301146c221c3780afb66d93523fbebd27.tar.bz2 nixlib-3c6e077301146c221c3780afb66d93523fbebd27.tar.lz nixlib-3c6e077301146c221c3780afb66d93523fbebd27.tar.xz nixlib-3c6e077301146c221c3780afb66d93523fbebd27.tar.zst nixlib-3c6e077301146c221c3780afb66d93523fbebd27.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Conflicts: pkgs/development/tools/misc/binutils/default.nix
Diffstat (limited to 'pkgs/servers/x11/xorg')
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 36543115e2e0..d15c5924b771 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2570,6 +2570,9 @@ let url = mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2; sha256 = "0kckng0zs1viz0nr84rdl6dswgip7ndn4pnh5nfwnviwpsfmmksd"; }; + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace $out/lib/X11/config/darwin.cf --replace "/usr/bin/" "" + ''; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ]; meta.platforms = stdenv.lib.platforms.unix; |