forked from mirrors/nixpkgs
treewide: Mass replace 'libjpeg}/lib' to refer the 'out' output
This commit is contained in:
parent
8707bf4a3c
commit
493349f82a
|
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
||||||
"--enable-subtitle"
|
"--enable-subtitle"
|
||||||
"--enable-ffms2"
|
"--enable-ffms2"
|
||||||
(enableFeature avxeditSupport "avxedit")
|
(enableFeature avxeditSupport "avxedit")
|
||||||
"--with-jpeg=${libjpeg}/lib"
|
"--with-jpeg=${libjpeg.out}/lib"
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||||
|
|
|
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||||
[ "--with-pngincludedir=${libpng}/include"
|
[ "--with-pngincludedir=${libpng}/include"
|
||||||
"--with-pnglibdir=${libpng}/lib"
|
"--with-pnglibdir=${libpng}/lib"
|
||||||
"--with-jpegincludedir=${libjpeg}/include"
|
"--with-jpegincludedir=${libjpeg}/include"
|
||||||
"--with-jpeglibdir=${libjpeg}/lib"
|
"--with-jpeglibdir=${libjpeg.out}/lib"
|
||||||
"--with-expatincludedir=${expat}/include"
|
"--with-expatincludedir=${expat}/include"
|
||||||
"--with-expatlibdir=${expat.out}/lib"
|
"--with-expatlibdir=${expat.out}/lib"
|
||||||
]
|
]
|
||||||
|
|
|
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||||
[ "--with-pngincludedir=${libpng}/include"
|
[ "--with-pngincludedir=${libpng}/include"
|
||||||
"--with-pnglibdir=${libpng}/lib"
|
"--with-pnglibdir=${libpng}/lib"
|
||||||
"--with-jpegincludedir=${libjpeg}/include"
|
"--with-jpegincludedir=${libjpeg}/include"
|
||||||
"--with-jpeglibdir=${libjpeg}/lib"
|
"--with-jpeglibdir=${libjpeg.out}/lib"
|
||||||
"--with-expatincludedir=${expat}/include"
|
"--with-expatincludedir=${expat}/include"
|
||||||
"--with-expatlibdir=${expat.out}/lib"
|
"--with-expatlibdir=${expat.out}/lib"
|
||||||
"--with-cgraph=no"
|
"--with-cgraph=no"
|
||||||
|
|
Loading…
Reference in a new issue