Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feh: 2.18.1 -> 2.18.2 #24028

Merged
merged 1 commit into from Mar 19, 2017
Merged

feh: 2.18.1 -> 2.18.2 #24028

merged 1 commit into from Mar 19, 2017

Conversation

ndowens
Copy link
Contributor

@ndowens ndowens commented Mar 18, 2017

Motivation for this change

Update

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

@ndowens, thanks for your PR! By analyzing the history of the files in this pull request, we identified @edolstra, @vbgl and @romildo to be potential reviewers.

@vbgl vbgl merged commit 705b2d9 into NixOS:master Mar 19, 2017
stdenv.mkDerivation rec {
name = "feh-2.18.1";
name = "feh-${version}";
version = "2.18.2";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The version field doesn't seem to be used anywhere else so simpler to just leave it directly in the name.

--add-flags '--theme=feh'
'';
--add-flags '--theme=feh'
'';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some stray whitespace here.


buildInputs = [ xorg.libX11 xorg.libXinerama imlib2 libjpeg libpng curl libexif ];

preBuild = ''
makeFlags="PREFIX=$out exif=1"
'';

libPath = makeLibraryPath ([ imlib2 curl xorg.libXinerama libjpeg libpng libexif xorg.libX11 ]);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think the parentheses do anything here. Should work fine without them.


buildInputs = [ xorg.libX11 xorg.libXinerama imlib2 libjpeg libpng curl libexif ];

preBuild = ''
makeFlags="PREFIX=$out exif=1"
'';

libPath = makeLibraryPath ([ imlib2 curl xorg.libXinerama libjpeg libpng libexif xorg.libX11 ]);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm a bit curious why the libPath field is required here. Did something change in 2.18.2 to need it or was there a problem with earlier versions as well?

@ndowens ndowens deleted the feh branch March 20, 2017 22:55
@rycee
Copy link
Member

rycee commented Mar 21, 2017

Umm, I would have appreciated some response to my comments.

@ndowens
Copy link
Contributor Author

ndowens commented Mar 21, 2017

It was attempt to fix it not finding that lib

@ndowens
Copy link
Contributor Author

ndowens commented Mar 21, 2017

I will update it later think I know how to fix it now

@ndowens
Copy link
Contributor Author

ndowens commented Mar 21, 2017

Sry didn't see msg

@rycee
Copy link
Member

rycee commented Mar 21, 2017

No worries.

Copy link
Contributor Author

@ndowens ndowens left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually I don't think I added that. I don't remember doing it anyway

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants