b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #145406 from SuperSandro2000/dbus-libs

Browse source
This commit is contained in:
Sandro 2021-11-30 21:17:20 +01:00 committed by GitHub
parent 01bce76b11 1fa0af9167
commit 3ccc568631
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkgs/development/libraries/gamin/default.nix
View file

@ -1,12 +1,11 @@
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, glib, autoreconfHook }:
let
cross = stdenv.hostPlatform != stdenv.buildPlatform;
in stdenv.mkDerivation (rec {
name = "gamin-0.1.10";
stdenv.mkDerivation rec {
pname = "gamin";
version = "0.1.10";
src = fetchurl {
url = "https://www.gnome.org/~veillard/gamin/sources/${name}.tar.gz";
url = "https://www.gnome.org/~veillard/gamin/sources/gamin-${version}.tar.gz";
sha256 = "18cr51y5qacvs2fc2p1bqv32rs8bzgs6l67zhasyl45yx055y218";
};
@ -22,6 +21,10 @@ in stdenv.mkDerivation (rec {
"CPPFLAGS=-D_GNU_SOURCE"
];
preBuild = lib.optionalString stdenv.isDarwin ''
sed -i 's/,--version-script=.*$/\\/' libgamin/Makefile
'';
patches = [ ./deadlock.patch ]
++ map fetchurl (import ./debian-patches.nix)
++ lib.optional stdenv.cc.isClang ./returnval.patch
@ -29,7 +32,7 @@ in stdenv.mkDerivation (rec {
name = "fix-pthread-mutex.patch";
url = "https://git.alpinelinux.org/aports/plain/main/gamin/fix-pthread-mutex.patch?h=3.4-stable&id=a1a836b089573752c1b0da7d144c0948b04e8ea8";
sha256 = "13igdbqsxb3sz0h417k6ifmq2n4siwqspj6slhc7fdl5wd1fxmdz";
}) ++ lib.optional (cross) ./abstract-socket-namespace.patch ;
}) ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./abstract-socket-namespace.patch;
meta = with lib; {
@ -41,8 +44,3 @@ in stdenv.mkDerivation (rec {
};
}
// lib.optionalAttrs stdenv.isDarwin {
preBuild = ''
sed -i 's/,--version-script=.*$/\\/' libgamin/Makefile
'';
})

17
pkgs/development/libraries/java/dbus-java/default.nix
View file

@ -1,18 +1,19 @@
{lib, stdenv, fetchurl, gettext, jdk8, libmatthew_java}:
{ lib, stdenv, fetchurl, gettext, jdk8, libmatthew_java }:
stdenv.mkDerivation rec {
pname = "dbus-java";
version = "2.7";
let jdk = jdk8; in
stdenv.mkDerivation {
name = "dbus-java-2.7";
src = fetchurl {
url = "https://dbus.freedesktop.org/releases/dbus-java/dbus-java-2.7.tar.gz";
url = "https://dbus.freedesktop.org/releases/dbus-java/dbus-java-${version}.tar.gz";
sha256 = "0cyaxd8x6sxmi6pklkkx45j311a6w51fxl4jc5j3inc4cailwh5y";
};
JAVA_HOME=jdk;
JAVA="${jdk}/bin/java";
JAVA_HOME=jdk8;
JAVA="${jdk8}/bin/java";
PREFIX="\${out}";
JAVAUNIXLIBDIR="${libmatthew_java}/lib/jni";
JAVAUNIXJARDIR="${libmatthew_java}/share/java";
buildInputs = [ gettext jdk ];
buildInputs = [ gettext jdk8 ];
# I'm too lazy to build the documentation
preBuild = ''
sed -i -e "s|all: bin doc man|all: bin|" \