lol

Merge pull request #7251 from spwhitt/feh

feh and imlib2: Darwin fixes

+18 -2
+1 -1
pkgs/applications/graphics/feh/default.nix
··· 25 25 homepage = https://derf.homelinux.org/projects/feh/; 26 26 license = stdenv.lib.licenses.mit; 27 27 maintainers = with stdenv.lib.maintainers; [viric]; 28 - platforms = with stdenv.lib.platforms; linux; 28 + platforms = with stdenv.lib.platforms; unix; 29 29 }; 30 30 }
+17 -1
pkgs/development/libraries/imlib2/default.nix
··· 21 21 --replace "@my_libs@" "" 22 22 ''; 23 23 24 + # Do not build amd64 assembly code on Darwin, because it fails to compile 25 + # with unknow directive errors 26 + configureFlags = if stdenv.isDarwin then [ "--enable-amd64=no" ] else null; 27 + 24 28 meta = { 25 - hydraPlatforms = stdenv.lib.platforms.linux; 29 + description = "Image manipulation library"; 30 + 31 + longDescription = '' 32 + This is the Imlib 2 library - a library that does image file loading and 33 + saving as well as rendering, manipulation, arbitrary polygon support, etc. 34 + It does ALL of these operations FAST. Imlib2 also tries to be highly 35 + intelligent about doing them, so writing naive programs can be done 36 + easily, without sacrificing speed. 37 + ''; 38 + 39 + license = stdenv.lib.licenses.free; 40 + platforms = stdenv.lib.platforms.unix; 41 + maintainers = with stdenv.lib.maintainers; [ spwhitt ]; 26 42 }; 27 43 }