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
|
|
@ -0,0 +1,17 @@
|
|||
diff -Naur gtkhtml-3.32.2-orig/configure gtkhtml-3.32.2/configure
|
||||
--- gtkhtml-3.32.2-orig/configure 2011-02-05 23:12:31.000000000 -0500
|
||||
+++ gtkhtml-3.32.2/configure 2011-04-22 13:03:18.228874636 -0400
|
||||
@@ -5761,12 +5761,7 @@
|
||||
|
||||
if test "x${enable_deprecated_flags}" = "xyes"; then
|
||||
|
||||
- list="-DG_DISABLE_DEPRECATED
|
||||
- -DPANGO_DISABLE_DEPRECATED
|
||||
- -DGDK_DISABLE_DEPRECATED
|
||||
- -DGDK_PIXBUF_DISABLE_DEPRECATED
|
||||
- -DGTK_DISABLE_DEPRECATED
|
||||
- -DGNOME_DISABLE_DEPRECATED"
|
||||
+ list=""
|
||||
flags_supported=""
|
||||
flags_unsupported=""
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for supported compiler flags" >&5
|
||||
30
pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix
Normal file
30
pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
{ stdenv, fetchFromGitLab, pkg-config, gtk3, intltool, autoreconfHook, fetchpatch
|
||||
, GConf, enchant, isocodes, gnome-icon-theme, gsettings-desktop-schemas }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "4.10.0";
|
||||
pname = "gtkhtml";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "Archive";
|
||||
repo = "gtkhtml";
|
||||
rev = "master";
|
||||
sha256 = "sha256-jL8YADvhW0o6I/2Uo5FNARMAnSbvtmFp+zWH1yCVvQk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Enables enchant2 support.
|
||||
# Upstream is dead, no further releases are coming.
|
||||
(fetchpatch {
|
||||
name ="enchant-2.patch";
|
||||
url = "https://aur.archlinux.org/cgit/aur.git/plain/enchant-2.patch?h=gtkhtml4&id=0218303a63d64c04d6483a6fe9bb55063fcfaa43";
|
||||
sha256 = "f0OToWGHZwxvqf+0qosfA9FfwJ/IXfjIPP5/WrcvArI=";
|
||||
extraPrefix = "";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ gsettings-desktop-schemas gtk3 gnome-icon-theme GConf ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ intltool enchant isocodes autoreconfHook ];
|
||||
}
|
||||
21
pkgs/desktops/gnome-2/platform/gtkhtml/default.nix
Normal file
21
pkgs/desktops/gnome-2/platform/gtkhtml/default.nix
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, gtk2, intltool,
|
||||
GConf, enchant, isocodes, gnome-icon-theme }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gtkhtml";
|
||||
version = "3.32.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gtkhtml/${lib.versions.majorMinor version}/gtkhtml-${version}.tar.bz2";
|
||||
sha256 = "17z3jwvpn8waz7bhwrk7a6vs9pad6sqmlxxcqwvxxq89ywy0ail7";
|
||||
};
|
||||
|
||||
#From Debian, fixes build issue described here:
|
||||
#http://www.mail-archive.com/debian-bugs-rc@lists.debian.org/msg250091.html
|
||||
patches = [ ./01_remove-disable-deprecated.patch ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ gtk2 intltool GConf enchant isocodes gnome-icon-theme ];
|
||||
|
||||
NIX_LDFLAGS = "-lgthread-2.0";
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue