public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pcmciaUtils: move defaults to package file

Browse Source
This commit is contained in:
Jan Malakhovski 2019-02-03 15:32:20 +00:00
parent 7562d78023
commit 40cde4d5d7
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/os-specific/linux/pcmciautils/default.nix
View File

@ -1,10 +1,9 @@
{ stdenv, fetchurl { config, lib, stdenv, fetchurl
, yacc, flex , yacc, flex
, sysfsutils, kmod, udev , sysfsutils, kmod, udev
, firmware # Special pcmcia cards. , firmware ? config.pcmciaUtils.firmware or [] # Special pcmcia cards.
, config # Special hardware (map memory & port & irq) , configOpts ? config.pcmciaUtils.config or null # Special hardware (map memory & port & irq)
, lib # used to generate postInstall script. }: # used to generate postInstall script.
}:
# FIXME: should add an option to choose between hotplug and udev. # FIXME: should add an option to choose between hotplug and udev.
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -28,8 +27,8 @@ stdenv.mkDerivation rec {
" src/{startup.c,pcmcia-check-broken-cis.c} # fix-color */ " src/{startup.c,pcmcia-check-broken-cis.c} # fix-color */
'' ''
+ (if firmware == [] then ''sed -i "s,STARTUP = true,STARTUP = false," Makefile'' else "") + (if firmware == [] then ''sed -i "s,STARTUP = true,STARTUP = false," Makefile'' else "")
+ (if config == null then "" else '' + (if configOpts == null then "" else ''
ln -sf ${config} ./config/config.opts'') ln -sf ${configOpts} ./config/config.opts'')
; ;
makeFlags = "LEX=flex"; makeFlags = "LEX=flex";

5
pkgs/top-level/all-packages.nix
View File

@ -14992,10 +14992,7 @@ in
pax-utils = callPackage ../os-specific/linux/pax-utils { }; pax-utils = callPackage ../os-specific/linux/pax-utils { };
pcmciaUtils = callPackage ../os-specific/linux/pcmciautils { pcmciaUtils = callPackage ../os-specific/linux/pcmciautils { };
firmware = config.pcmciaUtils.firmware or [];
config = config.pcmciaUtils.config or null;
};
pcstat = callPackage ../tools/system/pcstat { }; pcstat = callPackage ../tools/system/pcstat { };