diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:31:50 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:32:25 +0100 |
commit | b7baf40e099b4215181fe7b0c63083b12ef2c7fb (patch) | |
tree | a6efabd31d05b6d0a36624729e80377bbbfb0149 /nixpkgs/pkgs/applications/graphics/oculante/default.nix | |
parent | 710028664e26e85cb831a869b3da9f6993902255 (diff) | |
parent | 0799f514b1cd74878174939df79ac60ca5036673 (diff) | |
download | nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.gz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.bz2 nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.lz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.xz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.zst nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.zip |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/applications/graphics/oculante/default.nix')
-rw-r--r-- | nixpkgs/pkgs/applications/graphics/oculante/default.nix | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/applications/graphics/oculante/default.nix b/nixpkgs/pkgs/applications/graphics/oculante/default.nix index 1351f711f56d..f4a29a539c5c 100644 --- a/nixpkgs/pkgs/applications/graphics/oculante/default.nix +++ b/nixpkgs/pkgs/applications/graphics/oculante/default.nix @@ -22,18 +22,16 @@ rustPlatform.buildRustPackage rec { pname = "oculante"; - version = "0.7.7"; + version = "0.8.6"; src = fetchFromGitHub { owner = "woelper"; - repo = pname; + repo = "oculante"; rev = version; - hash = "sha256-uDSZ7qwDC/eR0aZN372ju21PBGuBiiYmlx/26Ta3luE="; + hash = "sha256-AuHiOZuRhO6PVyDyOtmNG6n/CN5brvJ/Ppn25QCshmE="; }; - cargoLock = { - lockFile = ./Cargo.lock; - }; + cargoHash = "sha256-EYwey8dDiyYGJa+scENOpaNK2qAVagTJrAPkSZj12w0="; nativeBuildInputs = [ cmake @@ -69,10 +67,8 @@ rustPlatform.buildRustPackage rec { postInstall = '' install -Dm444 $src/res/oculante.png -t $out/share/icons/hicolor/128x128/apps/ install -Dm444 $src/res/oculante.desktop -t $out/share/applications - ''; - - postFixup = lib.optionalString stdenv.isLinux '' - patchelf $out/bin/oculante --add-rpath ${lib.makeLibraryPath [ libxkbcommon libX11 ]} + wrapProgram $out/bin/oculante \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [libGL]} ''; meta = with lib; { |