pyrox.dev / nixpkgs
lol
fork atom

lxcfs: do not inherit enableDebugBuild from global namespace

Jörg Thalheim 84f40186 c75c99f4

+6 -4
unified split
+3 -3
pkgs/os-specific/linux/lxcfs/default.nix
··· 1 - { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, help2man, fuse, pam, 2 - debugBuild ? false }: 1 + { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, help2man, fuse, pam 2 + , enableDebugBuild ? false }: 3 3 4 4 with stdenv.lib; 5 5 stdenv.mkDerivation rec { ··· 15 15 nativeBuildInputs = [ pkgconfig help2man autoreconfHook ]; 16 16 buildInputs = [ fuse pam ]; 17 17 18 - preConfigure = stdenv.lib.optionalString debugBuild '' 18 + preConfigure = stdenv.lib.optionalString enableDebugBuild '' 19 19 sed -i 's,#AM_CFLAGS += -DDEBUG,AM_CFLAGS += -DDEBUG,' Makefile.am 20 20 ''; 21 21
+3 -1
pkgs/top-level/all-packages.nix
··· 3204 3204 ltris = callPackage ../games/ltris { }; 3205 3205 3206 3206 lxc = callPackage ../os-specific/linux/lxc { }; 3207 - lxcfs = callPackage ../os-specific/linux/lxcfs { }; 3207 + lxcfs = callPackage ../os-specific/linux/lxcfs { 3208 + enableDebugBuild = config.lxcfs.enableDebugBuild or false; 3209 + }; 3208 3210 lxd = callPackage ../tools/admin/lxd { }; 3209 3211 3210 3212 lzfse = callPackage ../tools/compression/lzfse { };