nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-21 19:44:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

lxcfs: do not inherit enableDebugBuild from global namespace

Browse Source
This commit is contained in:
Jörg Thalheim 2017-11-07 11:01:42 +00:00
parent c75c99f42e
commit 84f40186b2
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/os-specific/linux/lxcfs/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, help2man, fuse, pam, { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, help2man, fuse, pam
debugBuild ? false }: , enableDebugBuild ? false }:
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig help2man autoreconfHook ]; nativeBuildInputs = [ pkgconfig help2man autoreconfHook ];
buildInputs = [ fuse pam ]; buildInputs = [ fuse pam ];
preConfigure = stdenv.lib.optionalString debugBuild '' preConfigure = stdenv.lib.optionalString enableDebugBuild ''
sed -i 's,#AM_CFLAGS += -DDEBUG,AM_CFLAGS += -DDEBUG,' Makefile.am sed -i 's,#AM_CFLAGS += -DDEBUG,AM_CFLAGS += -DDEBUG,' Makefile.am
''; '';

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

@ -3204,7 +3204,9 @@ with pkgs;
ltris = callPackage ../games/ltris { }; ltris = callPackage ../games/ltris { };
lxc = callPackage ../os-specific/linux/lxc { }; lxc = callPackage ../os-specific/linux/lxc { };
lxcfs = callPackage ../os-specific/linux/lxcfs { }; lxcfs = callPackage ../os-specific/linux/lxcfs {
enableDebugBuild = config.lxcfs.enableDebugBuild or false;
};
lxd = callPackage ../tools/admin/lxd { }; lxd = callPackage ../tools/admin/lxd { };
lzfse = callPackage ../tools/compression/lzfse { }; lzfse = callPackage ../tools/compression/lzfse { };