gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

various: refactor meta section, hardcode pname, switch to finalAttrs (#442924)

Browse Source
This commit is contained in:
Gergő Gutyina
2026-02-21 12:54:10 +00:00
committed by GitHub
parent f130280853 8e66dc6920
commit 0ccffdeb46
9 changed files with 33 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/ae/aeolus-stops/package.nix
+5 -7
View File
@@ -4,25 +4,23 @@
fetchurl,
}:
stdenvNoCC.mkDerivation rec {
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "stops";
version = "0.4.0";
src = fetchurl {
url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/stops-${version}.tar.bz2";
url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/stops-${finalAttrs.version}.tar.bz2";
hash = "sha256-DnmguOAGyw9nv88ekJfbC04Qwbsw5tXEAaKeiCQR/LA=";
};
outputHashMode = "recursive";
outputHash = "sha256-gGHowq7g7MZmnhrpqG+3wNLwQCtpiBB88euIKeQIpJ0=";
subdir = "share/Aeolus/stops";
installPhase = ''
runHook preInstall
mkdir -p $out/${subdir}
cp -r * $out/${subdir}
mkdir -p $out/share/Aeolus/stops
cp -r * $out/share/Aeolus/stops
runHook postInstall
'';
@@ -36,4 +34,4 @@ stdenvNoCC.mkDerivation rec {
nico202
];
};
}
})
pkgs/by-name/ae/aeolus/package.nix
+1 -1
View File
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
cfg = ''
# Aeolus system wide default options
# Ignored if ~/.aeolusrc with local options exists
-u -S ${aeolus-stops}/${aeolus-stops.subdir}
-u -S ${aeolus-stops}/share/Aeolus/stops
'';
in
''
pkgs/by-name/ak/akkoma/package.nix
+1 -1
View File
@@ -47,7 +47,7 @@ beamPackages.mixRelease rec {
];
mixFodDeps = beamPackages.fetchMixDeps {
pname = "mix-deps-${pname}";
pname = "mix-deps-akkoma";
inherit src version;
hash = "sha256-DqSeMjom9UjgGjjfJomWCr7jQhXEkqVrDCvW3+pDtcQ=";
pkgs/by-name/al/alfaview/package.nix
+7 -7
View File
@@ -29,12 +29,12 @@
libx11,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "alfaview";
version = "9.24.1";
src = fetchurl {
url = "https://assets.alfaview.com/stable/linux/deb/${pname}_${version}.deb";
url = "https://assets.alfaview.com/stable/linux/deb/alfaview_${finalAttrs.version}.deb";
hash = "sha256-vRo5ZD3yYTWhR6fbc/HFtBBbYuq3cGbxPuDlSt5D8XM=";
};
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
libxcb-render-util
];
libPath = lib.makeLibraryPath buildInputs;
libPath = lib.makeLibraryPath finalAttrs.buildInputs;
dontBuild = true;
dontConfigure = true;
@@ -84,11 +84,11 @@ stdenv.mkDerivation rec {
mv opt $out
substituteInPlace $out/share/applications/alfaview.desktop \
--replace "/opt/alfaview" "$out/bin" \
--replace "/usr/share/pixmaps/alfaview_production.png" alfaview_production
--replace-fail "/opt/alfaview" "$out/bin" \
--replace-fail "/usr/share/pixmaps/alfaview.png" alfaview
makeWrapper $out/opt/alfaview/alfaview $out/bin/alfaview \
--prefix LD_LIBRARY_PATH : ${libPath}
--prefix LD_LIBRARY_PATH : ${finalAttrs.libPath}
runHook postInstall
'';
@@ -102,4 +102,4 @@ stdenv.mkDerivation rec {
mainProgram = "alfaview";
platforms = [ "x86_64-linux" ];
};
}
})
pkgs/by-name/al/altair/package.nix
+4 -4
View File
@@ -22,12 +22,12 @@ appimageTools.wrapType2 {
nativeBuildInputs = [ makeWrapper ];
extraInstallCommands = ''
wrapProgram $out/bin/${pname} \
wrapProgram $out/bin/altair \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
substituteInPlace $out/share/applications/${pname}.desktop \
--replace 'Exec=AppRun' 'Exec=${pname}'
install -m 444 -D ${appimageContents}/altair.desktop -t $out/share/applications
substituteInPlace $out/share/applications/altair.desktop \
--replace-fail 'Exec=AppRun' 'Exec=altair'
cp -r ${appimageContents}/usr/share/icons $out/share
'';
pkgs/by-name/an/analog/package.nix
+5 -5
View File
@@ -8,15 +8,15 @@
libpng,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "analog";
version = "6.0.18";
src = fetchFromGitHub {
owner = "c-amie";
repo = "analog-ce";
tag = version;
sha256 = "sha256-NCturEibnpl6+paUZezksHzP33WtAzfIolvBLeEHXjY=";
tag = finalAttrs.version;
hash = "sha256-NCturEibnpl6+paUZezksHzP33WtAzfIolvBLeEHXjY=";
};
buildInputs = [
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
postPatch = ''
sed -i src/anlghead.h \
-e "s|#define DEFAULTCONFIGFILE .*|#define DEFAULTCONFIGFILE \"$out/etc/analog.cfg\"|g" \
-e "s|#define LANGDIR .*|#define LANGDIR \"$out/share/${pname}/lang/\"|g"
-e "s|#define LANGDIR .*|#define LANGDIR \"$out/share/analog/lang/\"|g"
substituteInPlace src/Makefile \
--replace-fail "gcc" "${stdenv.cc.targetPrefix}cc" \
--replace-fail "LIBS = -lm" "LIBS = -lm -lpng -lgd -ljpeg -lz -lbz2" \
@@ -54,4 +54,4 @@ stdenv.mkDerivation rec {
mainProgram = "analog";
};
}
})
pkgs/by-name/an/andika/package.nix
+4 -4
View File
@@ -4,12 +4,12 @@
fetchzip,
}:
stdenvNoCC.mkDerivation rec {
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "andika";
version = "7.000";
src = fetchzip {
url = "https://software.sil.org/downloads/r/andika/Andika-${version}.zip";
url = "https://software.sil.org/downloads/r/andika/Andika-${finalAttrs.version}.zip";
hash = "sha256-46kbzFxNEpSuqyUwpScnxxgZi1dJlwK+AUkdULcinok=";
};
@@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec {
runHook preInstall
install -Dm644 *.ttf -t $out/share/fonts/truetype
install -Dm644 OFL.txt OFL-FAQ.txt README.txt FONTLOG.txt -t $out/share/doc/${pname}-${version}
install -Dm644 OFL.txt OFL-FAQ.txt README.txt FONTLOG.txt -t $out/share/doc/andika-${finalAttrs.version}
runHook postInstall
'';
@@ -34,4 +34,4 @@ stdenvNoCC.mkDerivation rec {
platforms = lib.platforms.all;
maintainers = [ lib.maintainers.f--t ];
};
}
})
pkgs/by-name/an/annapurna-sil/package.nix
+4 -4
View File
@@ -4,12 +4,12 @@
fetchzip,
}:
stdenvNoCC.mkDerivation rec {
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "annapurna-sil";
version = "2.100";
src = fetchzip {
url = "https://software.sil.org/downloads/r/annapurna/AnnapurnaSIL-${version}.zip";
url = "https://software.sil.org/downloads/r/annapurna/AnnapurnaSIL-${finalAttrs.version}.zip";
hash = "sha256-TFaCchtd9SRGsU9r+m8QOvZfc7/FJxwclkSfbLwf6/4=";
};
@@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec {
runHook preInstall
install -Dm644 *.ttf -t $out/share/fonts/truetype
install -Dm644 OFL.txt OFL-FAQ.txt README.txt FONTLOG.txt -t $out/share/doc/${pname}-${version}
install -Dm644 OFL.txt OFL-FAQ.txt README.txt FONTLOG.txt -t $out/share/doc/annapurna-sil-${finalAttrs.version}
runHook postInstall
'';
@@ -32,4 +32,4 @@ stdenvNoCC.mkDerivation rec {
platforms = lib.platforms.all;
maintainers = [ lib.maintainers.kmein ];
};
}
})
pkgs/by-name/ba/barcode/package.nix
+2 -2
View File
@@ -10,14 +10,14 @@ stdenv.mkDerivation (finalAttrs: {
pname = "barcode";
src = fetchurl {
url = "mirror://gnu/barcode/barcode-${finalAttrs.version}.tar.xz";
sha256 = "1indapql5fjz0bysyc88cmc54y8phqrbi7c76p71fgjp45jcyzp8";
hash = "sha256-6H7PZCFXPhfONYeduDKGF3lSWGUIMa/9Al+6QvFVzcY=";
};
patches = [
# Pull upstream patch for -fno-common toolchains.
(fetchpatch {
name = "fno-common.patch";
url = "http://git.savannah.gnu.org/cgit/barcode.git/patch/?id=4654f68706a459c9602d9932b56a56e8930f7d53";
sha256 = "15kclzcwlh0ymr7m48vc0m8z98q0wf4xbfcky4g1y8yvvpvvrfgc";
hash = "sha256-7Lm8993bIx8e8ZO51YnjAKP0UQVsI1JPrh5AytmnbJY=";
})
];