ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-25 12:22:37 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7251 from spwhitt/feh

Browse Source 
feh and imlib2: Darwin fixes
This commit is contained in:
Arseniy Seroka 2015-04-08 01:53:02 +03:00
commit b97435e15f
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/graphics/feh/default.nix
View File

@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
homepage = https://derf.homelinux.org/projects/feh/; homepage = https://derf.homelinux.org/projects/feh/;
license = stdenv.lib.licenses.mit; license = stdenv.lib.licenses.mit;
maintainers = with stdenv.lib.maintainers; [viric]; maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux; platforms = with stdenv.lib.platforms; unix;
}; };
} }

18
pkgs/development/libraries/imlib2/default.nix
View File

@ -21,7 +21,23 @@ stdenv.mkDerivation rec {
--replace "@my_libs@" "" --replace "@my_libs@" ""
''; '';
# Do not build amd64 assembly code on Darwin, because it fails to compile
# with unknow directive errors
configureFlags = if stdenv.isDarwin then [ "--enable-amd64=no" ] else null;
meta = { meta = {
hydraPlatforms = stdenv.lib.platforms.linux; description = "Image manipulation library";
longDescription = ''
This is the Imlib 2 library - a library that does image file loading and
saving as well as rendering, manipulation, arbitrary polygon support, etc.
It does ALL of these operations FAST. Imlib2 also tries to be highly
intelligent about doing them, so writing naive programs can be done
easily, without sacrificing speed.
'';
license = stdenv.lib.licenses.free;
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ spwhitt ];
}; };
} }