From 0d6a70bf0d6e9a04ec96ebe7ee6bd85b956bd43c Mon Sep 17 00:00:00 2001 From: Doug Lau Date: Sun, 29 Oct 2023 11:17:27 -0500 Subject: [PATCH] Remove nix build package (emulsion only) --- nix-example/.gitignore | 1 - nix-example/default.nix | 14 ----- nix-example/emulsion/default.nix | 96 -------------------------------- 3 files changed, 111 deletions(-) delete mode 100644 nix-example/.gitignore delete mode 100644 nix-example/default.nix delete mode 100644 nix-example/emulsion/default.nix diff --git a/nix-example/.gitignore b/nix-example/.gitignore deleted file mode 100644 index 1015c7fb..00000000 --- a/nix-example/.gitignore +++ /dev/null @@ -1 +0,0 @@ -result diff --git a/nix-example/default.nix b/nix-example/default.nix deleted file mode 100644 index 47f32a92..00000000 --- a/nix-example/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -with import {}; - -callPackage ./emulsion { - inherit (xorg) libXcursor libXxf86vm libXi; - inherit (darwin.apple_sdk.frameworks) AppKit CoreGraphics CoreServices Foundation OpenGL; -} - -# let -# pkgs = nixpkgs.pkgs; -# lib = nixpkgs.lib; -# in callPackage ./emulsion { -# inherit (xorg) libXcursor libXxf86vm libXi; -# inherit (darwin.apple_sdk.frameworks) AppKit CoreGraphics CoreServices CoreText Foundation OpenGL; -# } diff --git a/nix-example/emulsion/default.nix b/nix-example/emulsion/default.nix deleted file mode 100644 index 08472e81..00000000 --- a/nix-example/emulsion/default.nix +++ /dev/null @@ -1,96 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, rustPlatform - -, installShellFiles -, makeWrapper -, pkgconfig -, python3 - -, libGL -, libX11 -, libXcursor -, libXi -, libXrandr -, libXxf86vm -, libxcb -, libxkbcommon -, wayland -, xdg_utils - - # Darwin Frameworks -, 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 = "0.0.0"; - #version = "7.2.0"; - #verArray = builtins.splitVersion version; - - src = fetchFromGitHub { - owner = "ArturKovacs"; - repo = pname; - rev = "3d93d5e74554e0dfd92f2b1642ef952fbe34682e"; - sha256 = "08banc6qxdmjvkbl3cd6wyl110r3ji49ra0xx38y1xab28kakrga"; - }; - - cargoSha256 = "0jmh8gmvf1diq5vs1pnr8v27v77q00x2bi526j7rn5z61km2f1h9"; - - nativeBuildInputs = [ - installShellFiles - makeWrapper - pkgconfig - python3 - ]; - - buildInputs = rpathLibs - ++ lib.optionals stdenv.isDarwin [ - AppKit - CoreGraphics - CoreServices - Foundation - OpenGL - ]; - - outputs = [ "out" ]; - - installPhase = '' - runHook preInstall - install -D $releaseDir/emulsion $out/bin/emulsion - '' + ( - if !stdenv.isDarwin then '' - patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/emulsion - '' else '' - '' - ) + '' - runHook postInstall - ''; - - dontPatchELF = true; - - meta = with lib; { - description = "A fast and minimalistic image viewer"; - homepage = "https://arturkovacs.github.io/emulsion-website/"; - license = licenses.mit; - platforms = platforms.unix; - }; -}