diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-01-03 23:55:00 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2022-02-19 11:03:39 +0000 |
commit | f4cf97a04cd5d0b86aa46baec9fb228a8f671c03 (patch) | |
tree | 28192415ff39a661d0001563bf81cc93fa25d16d /nixpkgs/pkgs/development/libraries/java/dbus-java | |
parent | f8422837c9bde058e8f2de37702e7e94b2226040 (diff) | |
parent | 18c84ea816348e2a098390101b92d1e39a9dbd45 (diff) | |
download | nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.gz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.bz2 nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.lz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.xz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.zst nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.zip |
Merge commit '18c84ea816348e2a098390101b92d1e39a9dbd45'
Conflicts: nixpkgs/nixos/modules/misc/documentation.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix nixpkgs/pkgs/servers/mail/mailman/web.nix nixpkgs/pkgs/top-level/aliases.nix nixpkgs/pkgs/top-level/all-packages.nix nixpkgs/pkgs/top-level/impure.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/java/dbus-java')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/java/dbus-java/default.nix | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/development/libraries/java/dbus-java/default.nix b/nixpkgs/pkgs/development/libraries/java/dbus-java/default.nix index 9fbcf8b020ce..c8e67edfe2b5 100644 --- a/nixpkgs/pkgs/development/libraries/java/dbus-java/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/dbus-java/default.nix @@ -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|" \ |