3
0
Fork 0
forked from mirrors/nixpkgs

treewide: Mass replace 'libjpeg}/lib' to refer the 'out' output

This commit is contained in:
Tuomas Tynkkynen 2016-01-24 09:29:29 +02:00
parent 8707bf4a3c
commit 493349f82a
3 changed files with 3 additions and 3 deletions

View file

@ -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 ];

View file

@ -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"
] ]

View file

@ -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"