Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9fbcb14780ca
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c868414fcf29
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 1, 2021

  1. emulsion: init at 7.2

    @magnetophon
    magnetophon committed Jan 1, 2021

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    b4a9a5a View commit details

  2. Merge pull request #107831 from magnetophon/emulsion 

    emulsion: init at 7.2
    @AndersonTorres
    AndersonTorres authored Jan 1, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c868414 View commit details
Showing with 89 additions and 0 deletions.
  1. +85 −0 pkgs/applications/graphics/emulsion/default.nix
  2. +4 −0 pkgs/top-level/all-packages.nix
85 changes: 85 additions & 0 deletions pkgs/applications/graphics/emulsion/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
{ stdenv
, lib
, fetchFromGitHub
, rustPlatform
, installShellFiles
, makeWrapper
, pkg-config
, python3
, libGL
, libX11
, libXcursor
, libXi
, libXrandr
, libXxf86vm
, libxcb
, libxkbcommon
, wayland
, xdg_utils
, AppKit
, CoreGraphics
, CoreServices
, Foundation
, OpenGL
}:
let
rpathLibs = [
libGL
libX11
libXcursor
libXi
libXrandr
libXxf86vm
libxcb
] ++ lib.optionals stdenv.isLinux [
libxkbcommon
wayland
];
in
rustPlatform.buildRustPackage rec {
pname = "emulsion";
version = "7.2";

src = fetchFromGitHub {
owner = "ArturKovacs";
repo = pname;
rev = "v${version}";
sha256 = "1king04p5j4gsvprrfppwaxa5jn4ga4nc0v63wl6fvq2ngwnkg4g";
};

cargoSha256 = "19vb2q5w3063l7349p1b8q40n97a4hxdvc7h7qsx1iiwp75knbd0";

nativeBuildInputs = [
installShellFiles
makeWrapper
pkg-config
python3
];

buildInputs = rpathLibs ++ lib.optionals stdenv.isDarwin [
AppKit
CoreGraphics
CoreServices
Foundation
OpenGL
];

installPhase = ''
runHook preInstall
install -D $releaseDir/emulsion $out/bin/emulsion
'' + lib.optionalString stdenv.isLinux ''
patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/emulsion
'' + ''
runHook postInstall
'';

dontPatchELF = true;

meta = with lib; {
description = "A fast and minimalistic image viewer";
homepage = "https://arturkovacs.github.io/emulsion-website/";
maintainers = [ maintainers.magnetophon ];
platforms = platforms.unix;
license = licenses.mit;
};
}
4 changes: 4 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -3765,6 +3765,10 @@ in

emem = callPackage ../applications/misc/emem { };

emulsion = callPackage ../applications/graphics/emulsion {
inherit (darwin.apple_sdk.frameworks) AppKit CoreGraphics CoreServices Foundation OpenGL;
};

emv = callPackage ../tools/misc/emv { };

enblend-enfuse = callPackage ../tools/graphics/enblend-enfuse { };