uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
30
pkgs/servers/x11/quartz-wm/default.nix
Normal file
30
pkgs/servers/x11/quartz-wm/default.nix
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
{ lib, stdenv, fetchurl, xorg, pixman, pkg-config, AppKit, Foundation, Xplugin }:
|
||||
|
||||
let version = "1.3.1";
|
||||
in stdenv.mkDerivation {
|
||||
pname = "quartz-wm";
|
||||
inherit version;
|
||||
src = fetchurl {
|
||||
url = "http://xquartz-dl.macosforge.org/src/quartz-wm-${version}.tar.xz";
|
||||
sha256 = "1j8zd3p7rhay1s3sxq6anw78k5s59mx44xpqla2ianl62346a5g9";
|
||||
};
|
||||
patches = [
|
||||
./no_title_crash.patch
|
||||
./extern-patch.patch
|
||||
];
|
||||
buildInputs = [
|
||||
xorg.libXinerama
|
||||
xorg.libAppleWM
|
||||
xorg.xorgproto
|
||||
xorg.libXrandr
|
||||
xorg.libXext
|
||||
pixman
|
||||
pkg-config
|
||||
AppKit Xplugin Foundation
|
||||
];
|
||||
meta = with lib; {
|
||||
license = licenses.apsl20;
|
||||
platforms = platforms.darwin;
|
||||
maintainers = with maintainers; [ matthewbauer ];
|
||||
};
|
||||
}
|
||||
13
pkgs/servers/x11/quartz-wm/extern-patch.patch
Normal file
13
pkgs/servers/x11/quartz-wm/extern-patch.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/src/x-list.h b/src/x-list.h
|
||||
index bb85c02..059c88b 100644
|
||||
--- a/src/x-list.h
|
||||
+++ b/src/x-list.h
|
||||
@@ -39,7 +39,7 @@
|
||||
#endif
|
||||
|
||||
#ifndef X_EXTERN
|
||||
-# define X_EXTERN __private_extern__
|
||||
+# define X_EXTERN extern
|
||||
#endif
|
||||
|
||||
X_EXTERN void X_PFX (list_free_1) (x_list *node);
|
||||
25
pkgs/servers/x11/quartz-wm/no_title_crash.patch
Normal file
25
pkgs/servers/x11/quartz-wm/no_title_crash.patch
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
commit c28527b1340c51f2b492a31e49127106cebbfc5d
|
||||
Author: Jeremy Huddleston <jeremyhu@apple.com>
|
||||
Date: Fri Jun 1 10:38:37 2012 -0700
|
||||
|
||||
Fix a crash when minimizing windows without titles
|
||||
|
||||
<rdar://problem/11575791>
|
||||
|
||||
Regression-from: 21f210c923aa5d79400ce46275084f2636c92bd9
|
||||
|
||||
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
|
||||
|
||||
diff --git a/src/x-window.m b/src/x-window.m
|
||||
index a210c6a..e3b9066 100644
|
||||
--- a/src/x-window.m
|
||||
+++ b/src/x-window.m
|
||||
@@ -2139,7 +2139,7 @@ - (void) do_collapse
|
||||
if (wid == XP_NULL_NATIVE_WINDOW_ID)
|
||||
return;
|
||||
|
||||
- title_c = strdup([_title UTF8String]);
|
||||
+ title_c = strdup([[self title] UTF8String]);
|
||||
assert(title_c);
|
||||
|
||||
err = qwm_dock_minimize_item_with_title_async (wid, title_c);
|
||||
Loading…
Add table
Add a link
Reference in a new issue