commit 73f1f5eb3969743fe459e7cc36cfb766c7f5318a · pyrox.dev/nixpkgs

+1 -1

nixos/modules/services/web-servers/apache-httpd/mediawiki.nix

···

       43
       43
        
               # Paths to external programs.

     

       44
       44
        
               $wgDiff3 = "${pkgs.diffutils}/bin/diff3";

     

       45
       45
        
               $wgDiff = "${pkgs.diffutils}/bin/diff";

     

       46
       46
       -
               $wgImageMagickConvertCommand = "${pkgs.imagemagick}/bin/convert";

     

       46
       46
       +
               $wgImageMagickConvertCommand = "${pkgs.imagemagick.out}/bin/convert";

     

       47
       47
        
       

     

       48
       48
        
               #$wgDebugLogFile = "/tmp/mediawiki_debug_log.txt";

     

       49
       49

+3 -3

pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix

···

       19
       19
        
         patchPhase = ''

     

       20
       20
        
           sed -i "w3m.el" \

     

       21
       21
        
               -e 's|defcustom w3m-command nil|defcustom w3m-command "${w3m}/bin/w3m"|g ;

     

       22
       22
       -
                   s|(w3m-which-command "display")|"${imagemagick}/bin/display"|g'

     

       22
       22
       +
                   s|(w3m-which-command "display")|"${imagemagick.out}/bin/display"|g'

     

       23
       23
        
       

     

       24
       24
        
           sed -i "w3m-image.el" \

     

       25
       25
       -
               -e 's|(w3m-which-command "convert")|"${imagemagick}/bin/convert"|g ;

     

       26
       26
       -
                   s|(w3m-which-command "identify")|"${imagemagick}/bin/identify"|g'

     

       25
       25
       +
               -e 's|(w3m-which-command "convert")|"${imagemagick.out}/bin/convert"|g ;

     

       26
       26
       +
                   s|(w3m-which-command "identify")|"${imagemagick.out}/bin/identify"|g'

     

       27
       27
        
         '';

     

       28
       28
        
       

     

       29
       29
        
         configureFlags = [

+11 -5

pkgs/applications/graphics/ImageMagick/default.nix

···

       43
       43
        
       

     

       44
       44
        
         patches = [ ./imagetragick.patch ] ++ cfg.patches;

     

       45
       45
        
       

     

       46
       46
       -
         outputs = [ "out" "doc" ];

     

       46
       46
       +
         outputs = [ "dev" "out" "doc" ]; # bin/ isn't really big

     

       47
       47
       +
         outputMan = "out"; # it's tiny

     

       47
       48
        
       

     

       48
       49
        
         enableParallelBuilding = true;

     

       49
       50
        
       

     
···

       76
       77
        
           ;

     

       77
       78
        
       

     

       78
       79
        
         postInstall = ''

     

       79
       79
       -
       

     

       80
       80
       -
           (cd "$out/include" && ln -s ImageMagick* ImageMagick)

     

       80
       80
       +
           (cd "$dev/include" && ln -s ImageMagick* ImageMagick)

     

       81
       81
       +
           moveToOutput "bin/*-config" "$dev"

     

       82
       82
       +
           moveToOutput "lib/ImageMagick-*/config-Q16" "$dev" # includes configure params

     

       83
       83
       +
           for file in "$dev"/bin/*-config; do

     

       84
       84
       +
             substituteInPlace "$file" --replace pkg-config \

     

       85
       85
       +
               "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '${pkgconfig}/bin/pkg-config'"

     

       86
       86
       +
           done

     

       81
       87
        
         '' + lib.optionalString (ghostscript != null) ''

     

       82
       88
        
           for la in $out/lib/*.la; do

     

       83
       83
       -
             sed 's|-lgs|-L${ghostscript}/lib -lgs|' -i $la

     

       89
       89
       +
             sed 's|-lgs|-L${lib.getLib ghostscript}/lib -lgs|' -i $la

     

       84
       90
        
           done

     

       85
       91
        
         '';

     

       86
       92
        
       

     

       87
       93
        
         meta = with stdenv.lib; {

     

       88
       94
        
           homepage = http://www.imagemagick.org/;

     

       89
       95
        
           description = "A software suite to create, edit, compose, or convert bitmap images";

     

       90
       90
       -
           platforms = platforms.linux ++ [ "x86_64-darwin" ];

     

       96
       96
       +
           platforms = platforms.linux ++ platforms.darwin;

     

       91
       97
        
           maintainers = with maintainers; [ the-kenny wkennington ];

     

       92
       98
        
         };

     

       93
       99
        
       }

+2 -2

pkgs/applications/misc/calibre/default.nix

···

       47
       47
        
           export HOME=$TMPDIR/fakehome

     

       48
       48
        
           export POPPLER_INC_DIR=${poppler_utils.dev}/include/poppler

     

       49
       49
        
           export POPPLER_LIB_DIR=${poppler_utils.out}/lib

     

       50
       50
       -
           export MAGICK_INC=${imagemagick}/include/ImageMagick

     

       51
       51
       -
           export MAGICK_LIB=${imagemagick}/lib

     

       50
       50
       +
           export MAGICK_INC=${imagemagick.dev}/include/ImageMagick

     

       51
       51
       +
           export MAGICK_LIB=${imagemagick.out}/lib

     

       52
       52
        
           export FC_INC_DIR=${fontconfig.dev}/include/fontconfig

     

       53
       53
        
           export FC_LIB_DIR=${fontconfig.lib}/lib

     

       54
       54
        
           export PODOFO_INC_DIR=${podofo}/include/podofo

+1 -1

pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix

···

       19
       19
        
         '';

     

       20
       20
        
       

     

       21
       21
        
         passthru = {

     

       22
       22
       -
           wrapArgs = "--prefix PATH ':' ${texLive}/bin:${imagemagick}/bin";

     

       22
       22
       +
           wrapArgs = "--prefix PATH ':' ${texLive}/bin:${imagemagick.out}/bin";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         meta = with stdenv.lib; {

+1 -1

pkgs/applications/window-managers/i3/lock-fancy.nix

···

       17
       17
        
           sed -i -e "s|dirname|${coreutils}/bin/dirname|" lock

     

       18
       18
        
           sed -i -e "s|rm |${coreutils}/bin/rm |" lock

     

       19
       19
        
           sed -i -e "s|scrot |${scrot}/bin/scrot |" lock

     

       20
       20
       -
           sed -i -e "s|convert |${imagemagick}/bin/convert |" lock

     

       20
       20
       +
           sed -i -e "s|convert |${imagemagick.out}/bin/convert |" lock

     

       21
       21
        
           sed -i -e "s|awk |${gawk}/bin/awk|" lock

     

       22
       22
        
           sed -i -e "s|i3lock |${i3lock-color}/bin/i3lock-color |" lock

     

       23
       23
        
         '';

+1 -1

pkgs/misc/screensavers/rss-glx/default.nix

···

       11
       11
        
       

     

       12
       12
        
         buildInputs = [ pkgconfig mesa xlibsWrapper imagemagick libtiff bzip2 ];

     

       13
       13
        
       

     

       14
       14
       -
         NIX_CFLAGS_COMPILE = "-I${imagemagick}/include/ImageMagick";

     

       14
       14
       +
         NIX_CFLAGS_COMPILE = "-I${imagemagick.dev}/include/ImageMagick";

     

       15
       15
        
         NIX_LDFLAGS= "-rpath ${libXext}/lib";

     

       16
       16
        
       

     

       17
       17
        
         meta = {

+1 -1

pkgs/tools/security/prey/default.nix

···

       34
       34
        
           cp -R . $out

     

       35
       35
        
           cp -R ${modulesSrc}/* $out/modules/

     

       36
       36
        
           wrapProgram "$out/prey.sh" \

     

       37
       37
       -
             --prefix PATH ":" "${xawtv}/bin:${imagemagick}/bin:${curl.bin}/bin:${scrot}/bin:${inetutils}/bin:${coreutils}/bin" \

     

       37
       37
       +
             --prefix PATH ":" "${xawtv}/bin:${imagemagick.out}/bin:${curl.bin}/bin:${scrot}/bin:${inetutils}/bin:${coreutils}/bin" \

     

       38
       38
        
             --set CURL_CA_BUNDLE "/etc/ssl/certs/ca-certificates.crt"

     

       39
       39
        
         '';

     

       40
       40

+1 -1

pkgs/tools/typesetting/asciidoc/default.nix

···

       223
       223
        
       

     

       224
       224
        
           sed -e "s|run('abc2ly|run('${lilypond}/bin/abc2ly|g" \

     

       225
       225
        
               -e "s|run('lilypond|run('${lilypond}/bin/lilypond|g" \

     

       226
       226
       -
               -e "s|run('convert|run('${imagemagick}/bin/convert|g" \

     

       226
       226
       +
               -e "s|run('convert|run('${imagemagick.out}/bin/convert|g" \

     

       227
       227
        
               -i "filters/music/music2png.py"

     

       228
       228
        
       

     

       229
       229
        
           sed -e 's|filter="source-highlight|filter="${sourceHighlight}/bin/source-highlight|' \

+1 -1

pkgs/tools/typesetting/tex/dblatex/default.nix

···

       50
       50
        
                   -e 's|cmd = "inkscape|cmd = "${inkscape}/bin/inkscape|g' \

     

       51
       51
        
                   -e 's|cmd = "fig2dev|cmd = "${transfig}/bin/fig2dev|g' \

     

       52
       52
        
                   -e 's|cmd = \["ps2pdf|cmd = ["${ghostscript}/bin/ps2pdf|g' \

     

       53
       53
       -
                   -e 's|cmd = "convert|cmd = "${imagemagick}/bin/convert|g' \

     

       53
       53
       +
                   -e 's|cmd = "convert|cmd = "${imagemagick.out}/bin/convert|g' \

     

       54
       54
        
                   -i "$file"

     

       55
       55
        
           done

     

       56
       56
        
         '';

+1 -1

pkgs/top-level/perl-packages.nix

···

       9779
       9779
        
           buildInputs = [ pkgs.imagemagick ];

     

       9780
       9780
        
           preConfigure =

     

       9781
       9781
        
             ''

     

       9782
       9782
       -
               sed -i -e 's|my \$INC_magick = .*|my $INC_magick = "-I${pkgs.imagemagick}/include/ImageMagick";|' Makefile.PL

     

       9782
       9782
       +
               sed -i -e 's|my \$INC_magick = .*|my $INC_magick = "-I${pkgs.imagemagick.dev}/include/ImageMagick";|' Makefile.PL

     

       9783
       9783
        
             '';

     

       9784
       9784
        
           doCheck = false;

     

       9785
       9785
        
         };