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

v4l-utils: split to multiple outputs

Browse Source 
That required setting localedir to fix cycle.

Also do not patch shebangs globally.
This commit is contained in:
Jan Tojnar
2019-09-10 01:56:39 +02:00
parent e1cb839d17
commit e1d5779154
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/v4l-utils/default.nix
+8 -10
View File
@@ -19,14 +19,14 @@ in stdenv.mkDerivation rec {
sha256 = "1ng0x3wj3a1ckfd00yxa4za43xms92gdp7rdag060b7p39z7m4gf"; sha256 = "1ng0x3wj3a1ckfd00yxa4za43xms92gdp7rdag060b7p39z7m4gf";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" ] ++ lib.optional withUtils "lib" ++ [ "dev" ];
configureFlags = configureFlags = (if withUtils then [
if withUtils then [ "--with-localedir=${placeholder "lib"}/share/locale"
"--with-udevdir=${placeholder "out"}/lib/udev" "--with-udevdir=${placeholder "out"}/lib/udev"
] else [ ] else [
"--disable-v4l-utils" "--disable-v4l-utils"
]; ]);
postFixup = '' postFixup = ''
# Create symlink for V4l1 compatibility # Create symlink for V4l1 compatibility
@@ -39,10 +39,8 @@ in stdenv.mkDerivation rec {
propagatedBuildInputs = [ libjpeg ]; propagatedBuildInputs = [ libjpeg ];
NIX_CFLAGS_COMPILE = lib.optional withQt "-std=c++11";
postPatch = '' postPatch = ''
patchShebangs . patchShebangs utils/cec-ctl/msg2ctl.pl
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {