diff options
author | Jan Malakhovski <oxij@oxij.org> | 2019-02-03 15:32:20 +0000 |
---|---|---|
committer | Jan Malakhovski <oxij@oxij.org> | 2019-02-03 15:32:20 +0000 |
commit | 40cde4d5d7a3a908430299d0473ab647f1369908 (patch) | |
tree | b4a2d479b3c325c117562b2cfeb3c444b9cc71c6 /pkgs | |
parent | 7562d78023ebcfd72eb4797c716e1308eb835935 (diff) | |
download | nixpkgs-40cde4d5d7a3a908430299d0473ab647f1369908.tar nixpkgs-40cde4d5d7a3a908430299d0473ab647f1369908.tar.gz nixpkgs-40cde4d5d7a3a908430299d0473ab647f1369908.tar.bz2 nixpkgs-40cde4d5d7a3a908430299d0473ab647f1369908.tar.lz nixpkgs-40cde4d5d7a3a908430299d0473ab647f1369908.tar.xz nixpkgs-40cde4d5d7a3a908430299d0473ab647f1369908.tar.zst nixpkgs-40cde4d5d7a3a908430299d0473ab647f1369908.zip |
pcmciaUtils: move defaults to package file
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/os-specific/linux/pcmciautils/default.nix | 13 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 7 insertions, 11 deletions
diff --git a/pkgs/os-specific/linux/pcmciautils/default.nix b/pkgs/os-specific/linux/pcmciautils/default.nix index 93e2c097ff7..aeb4d78d0ec 100644 --- a/pkgs/os-specific/linux/pcmciautils/default.nix +++ b/pkgs/os-specific/linux/pcmciautils/default.nix @@ -1,10 +1,9 @@ -{ stdenv, fetchurl +{ config, lib, stdenv, fetchurl , yacc, flex , sysfsutils, kmod, udev -, firmware # Special pcmcia cards. -, config # Special hardware (map memory & port & irq) -, lib # used to generate postInstall script. -}: +, firmware ? config.pcmciaUtils.firmware or [] # Special pcmcia cards. +, configOpts ? config.pcmciaUtils.config or null # Special hardware (map memory & port & irq) +}: # used to generate postInstall script. # FIXME: should add an option to choose between hotplug and udev. stdenv.mkDerivation rec { @@ -28,8 +27,8 @@ stdenv.mkDerivation rec { " src/{startup.c,pcmcia-check-broken-cis.c} # fix-color */ '' + (if firmware == [] then ''sed -i "s,STARTUP = true,STARTUP = false," Makefile'' else "") - + (if config == null then "" else '' - ln -sf ${config} ./config/config.opts'') + + (if configOpts == null then "" else '' + ln -sf ${configOpts} ./config/config.opts'') ; makeFlags = "LEX=flex"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3486dec77e8..7ce4dcc02e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14992,10 +14992,7 @@ in pax-utils = callPackage ../os-specific/linux/pax-utils { }; - pcmciaUtils = callPackage ../os-specific/linux/pcmciautils { - firmware = config.pcmciaUtils.firmware or []; - config = config.pcmciaUtils.config or null; - }; + pcmciaUtils = callPackage ../os-specific/linux/pcmciautils { }; pcstat = callPackage ../tools/system/pcstat { }; |