lol

dbus-java: switch to pname+version, format

+9 -8
+9 -8
pkgs/development/libraries/java/dbus-java/default.nix
··· 1 - {lib, stdenv, fetchurl, gettext, jdk8, libmatthew_java}: 1 + { lib, stdenv, fetchurl, gettext, jdk8, libmatthew_java }: 2 + 3 + stdenv.mkDerivation rec { 4 + pname = "dbus-java"; 5 + version = "2.7"; 2 6 3 - let jdk = jdk8; in 4 - stdenv.mkDerivation { 5 - name = "dbus-java-2.7"; 6 7 src = fetchurl { 7 - url = "https://dbus.freedesktop.org/releases/dbus-java/dbus-java-2.7.tar.gz"; 8 + url = "https://dbus.freedesktop.org/releases/dbus-java/dbus-java-${version}.tar.gz"; 8 9 sha256 = "0cyaxd8x6sxmi6pklkkx45j311a6w51fxl4jc5j3inc4cailwh5y"; 9 10 }; 10 - JAVA_HOME=jdk; 11 - JAVA="${jdk}/bin/java"; 11 + JAVA_HOME=jdk8; 12 + JAVA="${jdk8}/bin/java"; 12 13 PREFIX="\${out}"; 13 14 JAVAUNIXLIBDIR="${libmatthew_java}/lib/jni"; 14 15 JAVAUNIXJARDIR="${libmatthew_java}/share/java"; 15 - buildInputs = [ gettext jdk ]; 16 + buildInputs = [ gettext jdk8 ]; 16 17 # I'm too lazy to build the documentation 17 18 preBuild = '' 18 19 sed -i -e "s|all: bin doc man|all: bin|" \