diff options
| -rw-r--r-- | modules/user/aszlig/profiles/workstation/default.nix | 3 | ||||
| -rw-r--r-- | modules/user/aszlig/profiles/workstation/packages.nix | 1 | ||||
| -rw-r--r-- | pkgs/aszlig/axbo/default.nix | 53 | ||||
| -rw-r--r-- | pkgs/aszlig/librxtx-java/default.nix | 53 |
4 files changed, 0 insertions, 110 deletions
diff --git a/modules/user/aszlig/profiles/workstation/default.nix b/modules/user/aszlig/profiles/workstation/default.nix index e08b9b30..55d56526 100644 --- a/modules/user/aszlig/profiles/workstation/default.nix +++ b/modules/user/aszlig/profiles/workstation/default.nix @@ -164,9 +164,6 @@ in { pcscd.plugins = [ pkgs.ccid pkgs.pcsc-cyberjack ]; udev.extraRules = '' - # aXbo S.P.A.C. - SUBSYSTEM=="tty", ATTRS{idVendor}=="10c4", ATTRS{idProduct}=="ea60", \ - ATTRS{serial}=="0001", OWNER="aszlig", SYMLINK+="axbo" # Enttec DMX device SUBSYSTEM=="usb*|tty", ACTION=="add|change", ATTRS{idVendor}=="0403", \ ATTRS{idProduct}=="6001", OWNER="aszlig" diff --git a/modules/user/aszlig/profiles/workstation/packages.nix b/modules/user/aszlig/profiles/workstation/packages.nix index 6a455f76..8beda8fc 100644 --- a/modules/user/aszlig/profiles/workstation/packages.nix +++ b/modules/user/aszlig/profiles/workstation/packages.nix @@ -5,7 +5,6 @@ pkgs: with pkgs; [ ascii aspellDicts.de aspellDicts.en - vuizvui.aszlig.axbo bc beets chromium diff --git a/pkgs/aszlig/axbo/default.nix b/pkgs/aszlig/axbo/default.nix deleted file mode 100644 index 35c9ee85..00000000 --- a/pkgs/aszlig/axbo/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ stdenv, lib, fetchurl, fetchFromGitHub, jdk, jre, ant, makeWrapper -, commonsLogging, librxtx_java -}: - -stdenv.mkDerivation rec { - name = "axbo-research-${version}"; - version = "3.0.12"; - - src = fetchFromGitHub { - owner = "jansolo"; - repo = "aXbo-research"; - #rev = "aXbo-research_${version}"; - # Includes MIT license: - rev = "6e6888917b5f200a44509650d6f46ec42c133cdc"; - sha256 = "0nbyxajl75q80cnyl9c0sjlyk3rmhm7k8w8mksg4lfyh78ynayyc"; - }; - - sourceRoot = "${src.name}/aXbo-research"; - - buildInputs = [ jdk ant makeWrapper ]; - - buildPhase = '' - ant -Dplatforms.JDK_1.7.home="$JAVA_HOME" jar - ''; - - extraJars = [ - "commons-beanutils-1.8.3" - "commons-digester3-3.2" - "commons-io-2.4" - "jcommon-1.0.20" - "jfreechart-1.0.16" - "streamflyer-core-1.0.1" - "swingx-all-1.6.4" - ]; - - installPhase = with lib; let - classpath = makeSearchPath "share/java/\\*" [ - "$out" - commonsLogging - librxtx_java - ]; - in '' - for dep in $extraJars; do - install -vD -m 644 "lib/$dep.jar" "$out/share/java/$dep.jar" - done - install -vD -m 644 dist/axbo.jar "$out/share/java/axbo.jar" - - mkdir -p "$out/bin" - makeWrapper "${jre}/bin/java" "$out/bin/axbo-research" \ - --add-flags "-Djava.library.path='${librxtx_java}/lib'" \ - --add-flags "-cp ${classpath} com.dreikraft.axbo.Axbo" - ''; -} diff --git a/pkgs/aszlig/librxtx-java/default.nix b/pkgs/aszlig/librxtx-java/default.nix deleted file mode 100644 index 8677fc6a..00000000 --- a/pkgs/aszlig/librxtx-java/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ stdenv, fetchurl, fetchpatch, unzip, autoreconfHook, jdk, lockdev }: - -stdenv.mkDerivation rec { - name = "rxtx-${version}"; - version = "2.2pre2"; - - src = fetchurl { - urls = [ - "http://rxtx.qbang.org/pub/rxtx/${name}.zip" - "ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/${name}.zip" - ]; - sha256 = "00sv9604hkq81mshih0fhqfzn4mf01d6rish6vplsi0gfqz3fc1w"; - }; - - patches = let - baseurl = "https://sources.debian.net/data/main/" - + "r/rxtx/2.2pre2+dfsg1-2/debian/patches"; - in [ - (fetchpatch { - url = "${baseurl}/fhs_lock_buffer_overflow_fix.patch"; - sha256 = "1v31q6ciy5v6bm5z8a1wssqn4nwvbcg4nnplgsvv1h8mzdq2832i"; - }) - (fetchpatch { - url = "${baseurl}/fix_snprintf.patch"; - sha256 = "09r9jca0hb13bx85l348jkxnh1p0g5i0d6dnpm142vlwsj0d7afy"; - }) - (fetchpatch { - url = "${baseurl}/format_security.patch"; - sha256 = "0adg7y9ak4xvgyswdhx6fsxq8jlb8y55xl3s6l0p8w0mfrhw7ysk"; - }) - (fetchpatch { - url = "${baseurl}/java10-compatibility.patch"; - sha256 = "05yzgjiyfb98q8444vx1qv1h81rr9d310q54dnnq18miciz4za7y"; - }) - ]; - - preAutoreconf = "rm *.m4"; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ unzip jdk lockdev ]; - - NIX_CFLAGS_COMPILE = "-DUTS_RELEASE=\"3.8.0\""; - - configureFlags = [ "--enable-liblock" ]; - - makeFlags = [ - "JHOME=$(out)/share/java" - "RXTX_PATH=$(out)/lib" - ]; - - preInstall = '' - mkdir -p "$out/lib" "$out/share/java" - ''; -} |