tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
imv: 4.3.1 -> 4.4.0
Sebastian Sellmeier
3 years ago
e6143a1b
c6fd9036
+15
-8
1 changed file
expand all
collapse all
unified
split
pkgs
applications
graphics
imv
default.nix
+15
-8
pkgs/applications/graphics/imv/default.nix
···
11
11
, icu
12
12
, pango
13
13
, inih
14
14
-
, withWindowSystem ? "all"
14
14
+
, withWindowSystem ? null
15
15
, xorg
16
16
, libxkbcommon
17
17
, libGLU
···
27
27
}:
28
28
29
29
let
30
30
+
# default value of withWindowSystem
31
31
+
withWindowSystem' =
32
32
+
if withWindowSystem != null then withWindowSystem
33
33
+
else if stdenv.isLinux then "all"
34
34
+
else "x11";
35
35
+
30
36
windowSystems = {
31
37
all = windowSystems.x11 ++ windowSystems.wayland;
32
38
x11 = [ libGLU xorg.libxcb xorg.libX11 ];
···
47
53
in
48
54
49
55
# check that given window system is valid
50
50
-
assert lib.assertOneOf "withWindowSystem" withWindowSystem
56
56
+
assert lib.assertOneOf "withWindowSystem" withWindowSystem'
51
57
(builtins.attrNames windowSystems);
52
58
# check that every given backend is valid
53
59
assert builtins.all
···
56
62
57
63
stdenv.mkDerivation rec {
58
64
pname = "imv";
59
59
-
version = "4.3.1";
65
65
+
version = "4.4.0";
60
66
outputs = [ "out" "man" ];
61
67
62
68
src = fetchFromSourcehut {
63
69
owner = "~exec64";
64
70
repo = "imv";
65
71
rev = "v${version}";
66
66
-
sha256 = "sha256-gMAd8skst72QT4jGFH7aRdWeAd4tf/uQgXhGaM/Dpgc=";
72
72
+
sha256 = "sha256-LLEEbriHzZhAOQivqHqdr6g7lh4uj++ytlme8AfRjf4=";
67
73
};
68
74
69
75
mesonFlags = [
70
70
-
"-Dwindows=${withWindowSystem}"
76
76
+
"-Dwindows=${withWindowSystem'}"
71
77
"-Dtest=enabled"
72
78
"-Dman=enabled"
73
79
] ++ backendFlags;
···
87
93
libxkbcommon
88
94
pango
89
95
inih
90
90
-
] ++ windowSystems."${withWindowSystem}"
96
96
+
] ++ windowSystems."${withWindowSystem'}"
91
97
++ builtins.map (b: backends."${b}") withBackends;
92
98
93
99
postInstall = ''
···
96
102
install -Dm644 ../files/imv.desktop $out/share/applications/
97
103
'';
98
104
99
99
-
postFixup = lib.optionalString (withWindowSystem == "all") ''
105
105
+
postFixup = lib.optionalString (withWindowSystem' == "all") ''
100
106
# The `bin/imv` script assumes imv-wayland or imv-x11 in PATH,
101
107
# so we have to fix those to the binaries we installed into the /nix/store
102
108
···
109
115
110
116
meta = with lib; {
111
117
description = "A command line image viewer for tiling window managers";
112
112
-
homepage = "https://github.com/eXeC64/imv";
118
118
+
homepage = "https://sr.ht/~exec64/imv/";
113
119
license = licenses.mit;
114
120
maintainers = with maintainers; [ rnhmjoj markus1189 ];
115
121
platforms = platforms.all;
122
122
+
badPlatforms = platforms.darwin;
116
123
};
117
124
}