summary refs log tree commit diff
diff options
context:
space:
mode:
authorJan Malakhovski <oxij@oxij.org>2019-02-03 15:30:30 +0000
committerJan Malakhovski <oxij@oxij.org>2019-02-03 15:30:30 +0000
commit6e1e0bb21317df8d063c51fe1c2e9233b62b981f (patch)
tree242d7d587c4252e46fcc6d3dd7bf3eec40ca543b
parent546c8ffef81ebd375252bb31c15620a0801eadeb (diff)
downloadnixpkgs-6e1e0bb21317df8d063c51fe1c2e9233b62b981f.tar
nixpkgs-6e1e0bb21317df8d063c51fe1c2e9233b62b981f.tar.gz
nixpkgs-6e1e0bb21317df8d063c51fe1c2e9233b62b981f.tar.bz2
nixpkgs-6e1e0bb21317df8d063c51fe1c2e9233b62b981f.tar.lz
nixpkgs-6e1e0bb21317df8d063c51fe1c2e9233b62b981f.tar.xz
nixpkgs-6e1e0bb21317df8d063c51fe1c2e9233b62b981f.tar.zst
nixpkgs-6e1e0bb21317df8d063c51fe1c2e9233b62b981f.zip
urjtag: move defaults to package file
-rw-r--r--pkgs/tools/misc/urjtag/default.nix8
-rw-r--r--pkgs/top-level/all-packages.nix7
2 files changed, 5 insertions, 10 deletions
diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/tools/misc/urjtag/default.nix
index 60a1ab325b1..545d7c554ac 100644
--- a/pkgs/tools/misc/urjtag/default.nix
+++ b/pkgs/tools/misc/urjtag/default.nix
@@ -1,10 +1,10 @@
 { stdenv, autoconf, automake, pkgconfig, gettext, libtool, bison
 , flex, which, subversion, fetchsvn, makeWrapper, libftdi, libusb, readline
 , python3
-, svfSupport ? false
-, bsdlSupport ? false
-, staplSupport ? false
-, jedecSupport ? false
+, svfSupport ? true
+, bsdlSupport ? true
+, staplSupport ? true
+, jedecSupport ? true
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bee9676158b..b26c7634ad7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6197,12 +6197,7 @@ in
 
   uptimed = callPackage ../tools/system/uptimed { };
 
-  urjtag = callPackage ../tools/misc/urjtag {
-    svfSupport = true;
-    bsdlSupport = true;
-    staplSupport = true;
-    jedecSupport = true;
-  };
+  urjtag = callPackage ../tools/misc/urjtag { };
 
   urlwatch = callPackage ../tools/networking/urlwatch { };