public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging

Browse Source 
* master: (271 commits)
  pysmbc: clarify license
  pysmbc: fix license
  bazel: 0.5.4 -> 0.6.0 (#29990)
  googler: init at 3.3
  go: declare support for aarch64
  firefox-beta-bin: 56.0b5 -> 57.0b4
  spotify: 1.0.64.401.g9d720389-21 -> 1.0.64.407.g9bd02c2d-26
  gogs: 0.11.19 -> 0.11.29
  grafana: 4.5.1 -> 4.5.2
  mopidy-iris: 3.4.1 -> 3.4.9
  nextcloud: 12.0.2 -> 12.0.3
  haskell-json-autotype: jailbreak to fix build within LTS 9.x
  kore: fix up
  kore: init at 2.0.0
  glusterfs service: fix issues with useRpcbind
  tig: 2.2.2 -> 2.3.0
  haskell-hspec-core: enable test suite again
  hackage-packages.nix: automatic Haskell package set update
  librsvg: fix thumbnailer path
  awscli: 1.11.108 -> 1.11.162
  ...
This commit is contained in:
Orivej Desh
2017-10-02 00:22:12 +00:00
parent 21976d1fbd 6b8806dff7
commit fda26c8476
260 changed files with 9682 additions and 4403 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/desktops/gnome-2/platform/libgnome/default.nix
+4 -2
View File
@@ -11,9 +11,11 @@ stdenv.mkDerivation rec {
sha256 = "197pnq8y0knqjhm2fg4j6hbqqm3qfzfnd0irhwxpk1b4hqb3kimj";
};
outputs = [ "out" "dev" ];
patches = [ ./new-glib.patch ];
/* There's a comment containing an invalid utf-8 sequence, breaking glib-mkenums. */
postPatch = "sed '/returns the true filename/d' -i libgnome/gnome-config.h";
outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ popt zlib intltool GConf gnome_vfs libcanberra libtool ];
pkgs/desktops/gnome-2/platform/libgnomeui/default.nix
+9 -1
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, libxml2, xorg, glib, pango
{ stdenv, fetchurl, fetchpatch, pkgconfig, libxml2, xorg, glib, pango
, intltool, libgnome, libgnomecanvas, libbonoboui, GConf, libtool
, gnome_vfs, libgnome_keyring, libglade }:
@@ -13,6 +13,14 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
patches = [
(fetchpatch {
name = "0001-gnome-scores.h-Convert-to-UTF-8.patch";
url = https://github.com/GNOME/libgnomeui/commit/30334c28794ef85d8973f4ed0779b5ceed6594f2.diff;
sha256 = "1sn8j8dkam14wfkpw8nga3gk63wniff243mzv3jp0fvv52q8sqhk";
})
];
nativeBuildInputs = [ pkgconfig intltool ];
buildInputs =
[ xorg.xlibsWrapper libxml2 GConf pango glib libgnome_keyring libglade libtool ];