diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-03-15 10:36:38 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-03-16 11:37:19 +0000 |
| commit | d435710923ac6e6f9fc155534800745004f2ce93 (patch) | |
| tree | 386f9401476f96bdc6ec25173a090198942b5d5b /nixpkgs/pkgs/development/idris-modules/build-idris-package.nix | |
| parent | c725f0011e91ae49d351b981690eb66b862b6104 (diff) | |
| parent | 3239fd2b8f728106491154b44625662e10259af2 (diff) | |
| download | nixlib-d435710923ac6e6f9fc155534800745004f2ce93.tar nixlib-d435710923ac6e6f9fc155534800745004f2ce93.tar.gz nixlib-d435710923ac6e6f9fc155534800745004f2ce93.tar.bz2 nixlib-d435710923ac6e6f9fc155534800745004f2ce93.tar.lz nixlib-d435710923ac6e6f9fc155534800745004f2ce93.tar.xz nixlib-d435710923ac6e6f9fc155534800745004f2ce93.tar.zst nixlib-d435710923ac6e6f9fc155534800745004f2ce93.zip | |
Merge commit '3239fd2b8f728106491154b44625662e10259af2'
Conflicts: nixpkgs/pkgs/applications/window-managers/sway/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/idris-modules/build-idris-package.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/idris-modules/build-idris-package.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/idris-modules/build-idris-package.nix b/nixpkgs/pkgs/development/idris-modules/build-idris-package.nix index 7869c2706999..b21826eac384 100644 --- a/nixpkgs/pkgs/development/idris-modules/build-idris-package.nix +++ b/nixpkgs/pkgs/development/idris-modules/build-idris-package.nix @@ -3,9 +3,9 @@ { idrisDeps ? [] , noPrelude ? false , noBase ? false - , name + , pname , version - , ipkgName ? name + , ipkgName ? pname , extraBuildInputs ? [] , idrisBuildOptions ? [] , idrisTestOptions ? [] @@ -20,7 +20,7 @@ let idris-with-packages = with-packages allIdrisDeps; newAttrs = builtins.removeAttrs attrs [ "idrisDeps" "noPrelude" "noBase" - "name" "version" "ipkgName" "extraBuildInputs" + "pname" "version" "ipkgName" "extraBuildInputs" ] // { meta = attrs.meta // { platforms = attrs.meta.platforms or idris.meta.platforms; @@ -28,7 +28,8 @@ let }; in stdenv.mkDerivation ({ - name = "idris-${name}-${version}"; + pname = "idris-${pname}"; + inherit version; buildInputs = [ idris-with-packages gmp ] ++ extraBuildInputs; propagatedBuildInputs = allIdrisDeps; |