cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #193491 from SFrijters/fsv-3.0

Browse source 
fsv: 0.9-1 -> 3.0
This commit is contained in:
Michele Guerini Rocco 2022-10-01 10:07:50 +02:00 committed by GitHub
commit bbfc30393b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
pkgs/applications/misc/fsv/default.nix
View file

@ -1,38 +1,47 @@
{ lib, stdenv, fetchurl, fetchFromGitHub, autoreconfHook { lib
, libtool, pkg-config, gtk2, libGLU, file , stdenv
, fetchFromGitHub
, meson
, ninja
, pkg-config
, cglm
, gtk3
, libepoxy
, libGLU
}: }:
let stdenv.mkDerivation rec {
gtkglarea = stdenv.mkDerivation rec {
pname = "gtkglarea";
version = "2.1.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1pl2vdj6l64j864ilhkq1bcggb3hrlxjwk5m029i7xfjfxc587lf";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gtk2 libGLU ];
hardeningDisable = [ "format" ];
};
in stdenv.mkDerivation rec {
pname = "fsv"; pname = "fsv";
version = "0.9-1"; version = "3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mcuelenaere"; owner = "jabl";
repo = "fsv"; repo = "fsv";
rev = "${pname}-${version}"; rev = "${pname}-${version}";
sha256 = "0n09jd7yqj18mx6zqbg7kab4idg5llr15g6avafj74fpg1h7iimj"; hash = "sha256-fxsA3qcBPvK4H5P4juGTe6eg1lkygvzFpNW36B9lsE4=";
}; };
postPatch = '' nativeBuildInputs = [
# fix build with gettext 0.20 meson
sed -i 's/AM_GNU_GETTEXT/AM_GNU_GETTEXT([external])/' configure.in ninja
''; pkg-config
];
nativeBuildInputs = [ autoreconfHook libtool pkg-config ]; buildInputs = [
buildInputs = [ file gtk2 libGLU gtkglarea ]; cglm
gtk3
libepoxy
libGLU
];
installPhase = ''
runHook preInstall
mkdir -p $out/bin
cp src/fsv $out/bin/fsv
runHook postInstall
'';
meta = with lib; { meta = with lib; {
description = "File system visualizer in cyberspace"; description = "File system visualizer in cyberspace";
@ -44,7 +53,7 @@ in stdenv.mkDerivation rec {
hard drive, or any arbitrarily large collection of files, limited only hard drive, or any arbitrarily large collection of files, limited only
by the host computer's memory and graphics hardware. by the host computer's memory and graphics hardware.
''; '';
homepage = "https://github.com/mcuelenaere/fsv"; homepage = "https://github.com/jabl/fsv";
license = licenses.lgpl2; license = licenses.lgpl2;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ rnhmjoj ]; maintainers = with maintainers; [ rnhmjoj ];

4
pkgs/top-level/all-packages.nix
View file

@ -27809,9 +27809,7 @@ with pkgs;
fritzprofiles = with python3.pkgs; toPythonApplication fritzprofiles; fritzprofiles = with python3.pkgs; toPythonApplication fritzprofiles;
fsv = callPackage ../applications/misc/fsv { fsv = callPackage ../applications/misc/fsv { };
autoreconfHook = buildPackages.autoreconfHook269;
};
ft2-clone = callPackage ../applications/audio/ft2-clone { ft2-clone = callPackage ../applications/audio/ft2-clone {
inherit (darwin.apple_sdk.frameworks) CoreAudio CoreMIDI CoreServices Cocoa; inherit (darwin.apple_sdk.frameworks) CoreAudio CoreMIDI CoreServices Cocoa;